فهرست منبع

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

David Catuhe 8 سال پیش
والد
کامیت
dda85bc1c1
30فایلهای تغییر یافته به همراه78 افزوده شده و 2 حذف شده
  1. 62 0
      Tools/Publisher/index.js
  2. 15 0
      Tools/Publisher/package.json
  3. 1 2
      src/Shaders/ShadersInclude/bumpFragmentFunctions.fx
  4. BIN
      tests/validation/ReferenceImages/Espilit.png
  5. BIN
      tests/validation/ReferenceImages/Flat2009.png
  6. BIN
      tests/validation/ReferenceImages/Heart.png
  7. BIN
      tests/validation/ReferenceImages/Hillvalley.png
  8. BIN
      tests/validation/ReferenceImages/PBRMetallicRoughnessMaterial.png
  9. BIN
      tests/validation/ReferenceImages/PBRSpecularGlossinessMaterial.png
  10. BIN
      tests/validation/ReferenceImages/SpaceDeK.png
  11. BIN
      tests/validation/ReferenceImages/Sponza.png
  12. BIN
      tests/validation/ReferenceImages/TheCar.png
  13. BIN
      tests/validation/ReferenceImages/Viper.png
  14. BIN
      tests/validation/ReferenceImages/WCafe.png
  15. BIN
      tests/validation/ReferenceImages/bones.png
  16. BIN
      tests/validation/ReferenceImages/displacementMap.png
  17. BIN
      tests/validation/ReferenceImages/fresnel.png
  18. BIN
      tests/validation/ReferenceImages/gltfnormals.png
  19. BIN
      tests/validation/ReferenceImages/highlights.png
  20. BIN
      tests/validation/ReferenceImages/lens.png
  21. BIN
      tests/validation/ReferenceImages/lod.png
  22. BIN
      tests/validation/ReferenceImages/mansion.png
  23. BIN
      tests/validation/ReferenceImages/normals.png
  24. BIN
      tests/validation/ReferenceImages/pbr.png
  25. BIN
      tests/validation/ReferenceImages/pbrglossy.png
  26. BIN
      tests/validation/ReferenceImages/pbrrough.png
  27. BIN
      tests/validation/ReferenceImages/pointLightShadows.png
  28. BIN
      tests/validation/ReferenceImages/retail.png
  29. BIN
      tests/validation/ReferenceImages/selfShadowing.png
  30. BIN
      tests/validation/ReferenceImages/softShadows.png

+ 62 - 0
Tools/Publisher/index.js

@@ -0,0 +1,62 @@
+let prompt = require('prompt');
+let shelljs = require('shelljs');
+let fs = require('fs');
+
+let basePath = '../../dist/preview release';
+
+// This can be changed when we have a new major release.
+let minimumDependency = '>=3.1.0-alpha';
+
+let packages = [
+    {
+        name: 'core',
+        path: '../../'
+    },
+    {
+        name: 'gui',
+        path: basePath + '/gui/'
+    },
+    {
+        name: 'materials',
+        path: basePath + '/materialsLibrary/'
+    },
+    {
+        name: 'postProcess',
+        path: basePath + '/postProcessesLibrary/'
+    },
+    {
+        name: 'loaders',
+        path: basePath + '/loaders/'
+    },
+    {
+        name: 'serializers',
+        path: basePath + '/serializers/'
+    },
+    {
+        name: 'proceduralTextures',
+        path: basePath + '/proceduralTexturesLibrary/'
+    }
+];
+
+//check if logged in
+let loginCheck = shelljs.exec('npm whoami');
+
+if (loginCheck.code === 0) {
+    prompt.start();
+
+    prompt.get(['version'], function (err, result) {
+        let version = result.version;
+        packages.forEach((package) => {
+            let packageJson = require(package.path + 'package.json');
+            packageJson.version = version;
+            if (packageJson.peerDependencies) packageJson.peerDependencies.babylonjs = minimumDependency;
+            fs.writeFileSync(package.path + 'package.json', JSON.stringify(packageJson, null, 4));
+            console.log('Publishing ' + package.name);
+            //publish the respected package
+            shelljs.exec('npm publih ' + package.path);
+        });
+    });
+} else {
+    console.log('not logged in.');
+}
+

+ 15 - 0
Tools/Publisher/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "banylonjs-publisher",
+  "version": "1.0.0",
+  "description": "Publishing babylon's packages automatically",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Raanan Weber",
+  "license": "ISC",
+  "dependencies": {
+    "prompt": "^1.0.0",
+    "shelljs": "^0.7.8"
+  }
+}

+ 1 - 2
src/Shaders/ShadersInclude/bumpFragmentFunctions.fx

@@ -41,8 +41,7 @@
 	vec3 perturbNormal(mat3 cotangentFrame, vec2 uv)
 	{
 		vec3 map = texture2D(bumpSampler, uv).xyz;
-
-		map = map * 255. / 127. - 128. / 127.;
+		map = map * 2.0 - 1.0;
 
 		#ifdef NORMALXYSCALE
 			map = normalize(map * vec3(vBumpInfos.y, vBumpInfos.y, 1.0));

BIN
tests/validation/ReferenceImages/Espilit.png


BIN
tests/validation/ReferenceImages/Flat2009.png


BIN
tests/validation/ReferenceImages/Heart.png


BIN
tests/validation/ReferenceImages/Hillvalley.png


BIN
tests/validation/ReferenceImages/PBRMetallicRoughnessMaterial.png


BIN
tests/validation/ReferenceImages/PBRSpecularGlossinessMaterial.png


BIN
tests/validation/ReferenceImages/SpaceDeK.png


BIN
tests/validation/ReferenceImages/Sponza.png


BIN
tests/validation/ReferenceImages/TheCar.png


BIN
tests/validation/ReferenceImages/Viper.png


BIN
tests/validation/ReferenceImages/WCafe.png


BIN
tests/validation/ReferenceImages/bones.png


BIN
tests/validation/ReferenceImages/displacementMap.png


BIN
tests/validation/ReferenceImages/fresnel.png


BIN
tests/validation/ReferenceImages/gltfnormals.png


BIN
tests/validation/ReferenceImages/highlights.png


BIN
tests/validation/ReferenceImages/lens.png


BIN
tests/validation/ReferenceImages/lod.png


BIN
tests/validation/ReferenceImages/mansion.png


BIN
tests/validation/ReferenceImages/normals.png


BIN
tests/validation/ReferenceImages/pbr.png


BIN
tests/validation/ReferenceImages/pbrglossy.png


BIN
tests/validation/ReferenceImages/pbrrough.png


BIN
tests/validation/ReferenceImages/pointLightShadows.png


BIN
tests/validation/ReferenceImages/retail.png


BIN
tests/validation/ReferenceImages/selfShadowing.png


BIN
tests/validation/ReferenceImages/softShadows.png