Skip to content

T
three.js

车家大少爷 / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

体验新版 GitCode，发现更多精彩内容 >>

提交 1e26eb05 编写于 作者: S SUNAG
浏览文件
操作

rename *MaterialNode to *NodeMaterial

上级 1558f02a
隐藏空白更改
内联 并排
Showing with 86 addition and 52 deletion
examples/js/materials/nodes/MaterialNode.js → examples/js/materials/nodes/NodeMaterial.js
浏览文件 @ 1e26eb05
......@@ -2,7 +2,7 @@
* @author sunag / http://www.sunag.com.br/
*/
THREE.MaterialNode = function( vertex, fragment ) {
THREE.NodeMaterial = function( vertex, fragment ) {
THREE.ShaderMaterial.call( this );
......@@ -11,10 +11,10 @@ THREE.MaterialNode = function( vertex, fragment ) {
};
THREE.MaterialNode.prototype = Object.create( THREE.ShaderMaterial.prototype );
THREE.MaterialNode.prototype.constructor = THREE.MaterialNode;
THREE.NodeMaterial.prototype = Object.create( THREE.ShaderMaterial.prototype );
THREE.NodeMaterial.prototype.constructor = THREE.NodeMaterial;
THREE.MaterialNode.Type = {
THREE.NodeMaterial.Type = {
t : 'sampler2D',
tc : 'samplerCube',
bv1 : 'bool',
......@@ -26,7 +26,7 @@ THREE.MaterialNode.Type = {
v4 : 'vec4'
};
THREE.MaterialNode.GetShortcuts = function( prop, name ) {
THREE.NodeMaterial.GetShortcuts = function( prop, name ) {
return {
get: function () { return this[prop][name]; },
......@@ -35,7 +35,7 @@ THREE.MaterialNode.GetShortcuts = function( prop, name ) {
};
THREE.MaterialNode.Shortcuts = function( proto, prop, list ) {
THREE.NodeMaterial.Shortcuts = function( proto, prop, list ) {
var shortcuts = {};
......@@ -51,7 +51,7 @@ THREE.MaterialNode.Shortcuts = function( proto, prop, list ) {
};
THREE.MaterialNode.prototype.updateAnimation = function( delta ) {
THREE.NodeMaterial.prototype.updateAnimation = function( delta ) {
for(var i = 0; i < this.requestUpdate.length; ++i) {
......@@ -61,7 +61,7 @@ THREE.MaterialNode.prototype.updateAnimation = function( delta ) {
};
THREE.MaterialNode.prototype.build = function() {
THREE.NodeMaterial.prototype.build = function() {
var vertex, fragment;
......@@ -214,19 +214,19 @@ THREE.MaterialNode.prototype.build = function() {
return this;
};
THREE.MaterialNode.prototype.define = function(name, value) {
THREE.NodeMaterial.prototype.define = function(name, value) {
this.defines[name] = value == undefined ? 1 : value;
};
THREE.MaterialNode.prototype.isDefined = function(name) {
THREE.NodeMaterial.prototype.isDefined = function(name) {
return this.defines[name] != undefined;
};
THREE.MaterialNode.prototype.mergeUniform = function( uniforms ) {
THREE.NodeMaterial.prototype.mergeUniform = function( uniforms ) {
for (var name in uniforms) {
......@@ -236,7 +236,7 @@ THREE.MaterialNode.prototype.mergeUniform = function( uniforms ) {
};
THREE.MaterialNode.prototype.createUniform = function( value, type, needsUpdate ) {
THREE.NodeMaterial.prototype.createUniform = function( value, type, needsUpdate ) {
var index = this.uniformList.length;
......@@ -253,7 +253,7 @@ THREE.MaterialNode.prototype.createUniform = function( value, type, needsUpdate
};
THREE.MaterialNode.prototype.getVertexTemp = function( uuid, type ) {
THREE.NodeMaterial.prototype.getVertexTemp = function( uuid, type ) {
if (!this.vertexTemps[ uuid ]) {
......@@ -270,7 +270,7 @@ THREE.MaterialNode.prototype.getVertexTemp = function( uuid, type ) {
};
THREE.MaterialNode.prototype.getIncludes = function( incs ) {
THREE.NodeMaterial.prototype.getIncludes = function( incs ) {
function sortByPosition(a, b){
return b.deps - a.deps;
......@@ -293,7 +293,7 @@ THREE.MaterialNode.prototype.getIncludes = function( incs ) {
}
}();
THREE.MaterialNode.prototype.getFragmentTemp = function( uuid, type ) {
THREE.NodeMaterial.prototype.getFragmentTemp = function( uuid, type ) {
if (!this.fragmentTemps[ uuid ]) {
......@@ -310,37 +310,37 @@ THREE.MaterialNode.prototype.getFragmentTemp = function( uuid, type ) {
};
THREE.MaterialNode.prototype.addVertexPars = function( code ) {
THREE.NodeMaterial.prototype.addVertexPars = function( code ) {
this.vertexPars += code + '\n';
};
THREE.MaterialNode.prototype.addFragmentPars = function( code ) {
THREE.NodeMaterial.prototype.addFragmentPars = function( code ) {
this.fragmentPars += code + '\n';
};
THREE.MaterialNode.prototype.addVertexCode = function( code ) {
THREE.NodeMaterial.prototype.addVertexCode = function( code ) {
this.vertexCode += code + '\n';
};
THREE.MaterialNode.prototype.addFragmentCode = function( code ) {
THREE.NodeMaterial.prototype.addFragmentCode = function( code ) {
this.fragmentCode += code + '\n';
};
THREE.MaterialNode.prototype.addVertexNode = function( code ) {
THREE.NodeMaterial.prototype.addVertexNode = function( code ) {
this.vertexNode += code + '\n';
};
THREE.MaterialNode.prototype.clearVertexNode = function() {
THREE.NodeMaterial.prototype.clearVertexNode = function() {
var code = this.fragmentNode;
......@@ -350,13 +350,13 @@ THREE.MaterialNode.prototype.clearVertexNode = function() {
};
THREE.MaterialNode.prototype.addFragmentNode = function( code ) {
THREE.NodeMaterial.prototype.addFragmentNode = function( code ) {
this.fragmentNode += code + '\n';
};
THREE.MaterialNode.prototype.clearFragmentNode = function() {
THREE.NodeMaterial.prototype.clearFragmentNode = function() {
var code = this.fragmentNode;
......@@ -366,7 +366,7 @@ THREE.MaterialNode.prototype.clearFragmentNode = function() {
};
THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) {
THREE.NodeMaterial.prototype.getCodePars = function( pars, prefix ) {
prefix = prefix || '';
......@@ -380,7 +380,7 @@ THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) {
if (parsType == 't' && parsValue instanceof THREE.CubeTexture) parsType = 'tc';
var type = THREE.MaterialNode.Type[ parsType ];
var type = THREE.NodeMaterial.Type[ parsType ];
if (type == undefined) throw new Error( "Node pars " + parsType + " not found." );
......@@ -391,7 +391,7 @@ THREE.MaterialNode.prototype.getCodePars = function( pars, prefix ) {
};
THREE.MaterialNode.prototype.getVertexUniform = function( value, type, needsUpdate ) {
THREE.NodeMaterial.prototype.getVertexUniform = function( value, type, needsUpdate ) {
var uniform = this.createUniform( value, type, needsUpdate );
......@@ -404,7 +404,7 @@ THREE.MaterialNode.prototype.getVertexUniform = function( value, type, needsUpda
};
THREE.MaterialNode.prototype.getFragmentUniform = function( value, type, needsUpdate ) {
THREE.NodeMaterial.prototype.getFragmentUniform = function( value, type, needsUpdate ) {
var uniform = this.createUniform( value, type, needsUpdate );
......@@ -417,13 +417,13 @@ THREE.MaterialNode.prototype.getFragmentUniform = function( value, type, needsUp
};
THREE.MaterialNode.prototype.getDataNode = function( uuid ) {
THREE.NodeMaterial.prototype.getDataNode = function( uuid ) {
return this.nodeData[uuid] = this.nodeData[uuid] || {};
};
THREE.MaterialNode.prototype.include = function( shader, node ) {
THREE.NodeMaterial.prototype.include = function( shader, node ) {
var includes;
......
examples/js/materials/nodes/inputs/ColorNode.js
浏览文件 @ 1e26eb05
......@@ -13,4 +13,4 @@ THREE.ColorNode = function( color ) {
THREE.ColorNode.prototype = Object.create( THREE.InputNode.prototype );
THREE.ColorNode.prototype.constructor = THREE.ColorNode;
THREE.MaterialNode.Shortcuts( THREE.ColorNode.prototype, 'value', [ 'r', 'g', 'b' ] );
\ No newline at end of file
THREE.NodeMaterial.Shortcuts( THREE.ColorNode.prototype, 'value', [ 'r', 'g', 'b' ] );
\ No newline at end of file
examples/js/materials/nodes/inputs/Vector2Node.js
浏览文件 @ 1e26eb05
......@@ -13,4 +13,4 @@ THREE.Vector2Node = function( x, y ) {
THREE.Vector2Node.prototype = Object.create( THREE.InputNode.prototype );
THREE.Vector2Node.prototype.constructor = THREE.Vector2Node;
THREE.MaterialNode.Shortcuts( THREE.Vector2Node.prototype, 'value', [ 'x', 'y' ] );
\ No newline at end of file
THREE.NodeMaterial.Shortcuts( THREE.Vector2Node.prototype, 'value', [ 'x', 'y' ] );
\ No newline at end of file
examples/js/materials/nodes/inputs/Vector3Node.js
浏览文件 @ 1e26eb05
......@@ -14,4 +14,4 @@ THREE.Vector3Node = function( x, y, z ) {
THREE.Vector3Node.prototype = Object.create( THREE.InputNode.prototype );
THREE.Vector3Node.prototype.constructor = THREE.Vector3Node;
THREE.MaterialNode.Shortcuts( THREE.Vector3Node.prototype, 'value', [ 'x', 'y', 'z' ] );
\ No newline at end of file
THREE.NodeMaterial.Shortcuts( THREE.Vector3Node.prototype, 'value', [ 'x', 'y', 'z' ] );
\ No newline at end of file
examples/js/materials/nodes/inputs/Vector4Node.js
浏览文件 @ 1e26eb05
......@@ -13,4 +13,4 @@ THREE.Vector4Node = function( x, y, z, w ) {
THREE.Vector4Node.prototype = Object.create( THREE.InputNode.prototype );
THREE.Vector4Node.prototype.constructor = THREE.Vector4Node;
THREE.MaterialNode.Shortcuts( THREE.Vector4Node.prototype, 'value', [ 'x', 'y', 'z', 'w' ] );
\ No newline at end of file
THREE.NodeMaterial.Shortcuts( THREE.Vector4Node.prototype, 'value', [ 'x', 'y', 'z', 'w' ] );
\ No newline at end of file
examples/js/materials/nodes/interfaces/PhongMaterialNode.js → examples/js/materials/nodes/interfaces/PhongNodeMaterial.js
浏览文件 @ 1e26eb05
......@@ -2,16 +2,16 @@
* @author sunag / http://www.sunag.com.br/
*/
THREE.PhongMaterialNode = function() {
THREE.PhongNodeMaterial = function() {
this.node = new THREE.PhongNode();
THREE.MaterialNode.call( this, this.node, this.node );
THREE.NodeMaterial.call( this, this.node, this.node );
};
THREE.PhongMaterialNode.prototype = Object.create( THREE.MaterialNode.prototype );
THREE.PhongMaterialNode.prototype.constructor = THREE.PhongMaterialNode;
THREE.PhongNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototype );
THREE.PhongNodeMaterial.prototype.constructor = THREE.PhongNodeMaterial;
THREE.MaterialNode.Shortcuts( THREE.PhongMaterialNode.prototype, 'node',
THREE.NodeMaterial.Shortcuts( THREE.PhongNodeMaterial.prototype, 'node',
[ 'color', 'alpha', 'specular', 'shininess', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] );
\ No newline at end of file
examples/js/materials/nodes/interfaces/StandardMaterialNode.js → examples/js/materials/nodes/interfaces/StandardNodeMaterial.js
浏览文件 @ 1e26eb05
......@@ -2,16 +2,16 @@
* @author sunag / http://www.sunag.com.br/
*/
THREE.StandardMaterialNode = function() {
THREE.StandardNodeMaterial = function() {
this.node = new THREE.StandardNode();
THREE.MaterialNode.call( this, this.node, this.node );
THREE.NodeMaterial.call( this, this.node, this.node );
};
THREE.StandardMaterialNode.prototype = Object.create( THREE.MaterialNode.prototype );
THREE.StandardMaterialNode.prototype.constructor = THREE.StandardMaterialNode;
THREE.StandardNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototype );
THREE.StandardNodeMaterial.prototype.constructor = THREE.StandardNodeMaterial;
THREE.MaterialNode.Shortcuts( THREE.StandardMaterialNode.prototype, 'node',
THREE.NodeMaterial.Shortcuts( THREE.StandardNodeMaterial.prototype, 'node',
[ 'color', 'alpha', 'roughness', 'metalness', 'normal', 'normalScale', 'emissive', 'ambient', 'shadow', 'ao', 'environment', 'reflectivity', 'transform' ] );
\ No newline at end of file
examples/webgl_materials_nodes.html
浏览文件 @ 1e26eb05
<!doctype html>
<html lang="en">
<head>
<title>WebGL MaterialNode</title>
<title>WebGL NodeMaterial</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
<style>
......@@ -39,13 +39,13 @@
<script src="js/controls/OrbitControls.js"></script>
<script src="js/libs/dat.gui.min.js"></script>
<!-- MaterialNode Base -->
<!-- NodeMaterial Base -->
<script src="js/materials/nodes/GLNode.js"></script>
<script src="js/materials/nodes/BuilderNode.js"></script>
<script src="js/materials/nodes/RawNode.js"></script>
<script src="js/materials/nodes/TempNode.js"></script>
<script src="js/materials/nodes/InputNode.js"></script>
<script src="js/materials/nodes/MaterialNode.js"></script>
<script src="js/materials/nodes/NodeMaterial.js"></script>
<script src="js/materials/nodes/ConstNode.js"></script>
<script src="js/materials/nodes/FunctionNode.js"></script>
<script src="js/materials/nodes/FunctionCallNode.js"></script>
......@@ -83,9 +83,9 @@
<!-- Interfaces -->
<script src="js/materials/nodes/interfaces/PhongNode.js"></script>
<script src="js/materials/nodes/interfaces/PhongMaterialNode.js"></script>
<script src="js/materials/nodes/interfaces/PhongNodeMaterial.js"></script>
<script src="js/materials/nodes/interfaces/StandardNode.js"></script>
<script src="js/materials/nodes/interfaces/StandardMaterialNode.js"></script>
<script src="js/materials/nodes/interfaces/StandardNodeMaterial.js"></script>
<!-- Extras -->
<script src="js/materials/nodes/extras/VelocityNode.js"></script>
......@@ -253,7 +253,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
//mtl.color = // albedo color
//mtl.alpha = // opacity (0 at 1)
......@@ -285,7 +285,7 @@
// MATERIAL
mtl = new THREE.StandardMaterialNode();
mtl = new THREE.StandardNodeMaterial();
//mtl.color = // albedo color
//mtl.alpha = // opacity (0 at 1)
......@@ -382,7 +382,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var time = new THREE.TimeNode();
var speed = new THREE.FloatNode(5);
......@@ -494,7 +494,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var intensity = 1.3;
var power = new THREE.FloatNode(3);
......@@ -580,7 +580,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var reflectance = new THREE.FloatNode(1.3);
var power = new THREE.FloatNode(1);
......@@ -634,7 +634,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var tex1 = new THREE.TextureNode(grass);
var tex2 = new THREE.TextureNode(brick);
......@@ -687,7 +687,7 @@
// MATERIAL
mtl = new THREE.StandardMaterialNode();
mtl = new THREE.StandardNodeMaterial();
var tex = new THREE.TextureNode(brick);
var sat = new THREE.FloatNode(0);
......@@ -726,7 +726,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var top = new THREE.TextureNode(grass);
var bottom = new THREE.TextureNode(brick);
......@@ -775,7 +775,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var time = new THREE.TimeNode();
var scale = new THREE.FloatNode(2);
......@@ -861,7 +861,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var time = new THREE.TimeNode();
var uv = new THREE.UVNode();
......@@ -930,7 +930,7 @@
THREE.Math3Node.MIX
);
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
mtl.color = colors;
// GUI
......@@ -965,7 +965,7 @@
// MATERIAL
mtl = new THREE.StandardMaterialNode();
mtl = new THREE.StandardNodeMaterial();
var hash2 = new THREE.FunctionNode([
"vec2 hash2(vec2 p) {",
......@@ -1136,7 +1136,7 @@
move = true;
mtl = new THREE.StandardMaterialNode();
mtl = new THREE.StandardNodeMaterial();
var scale = new THREE.FloatNode(2);
var colorA = new THREE.ColorNode(0xFF6633);
......@@ -1219,7 +1219,7 @@
// MATERIAL
mtl = new THREE.PhongMaterialNode();
mtl = new THREE.PhongNodeMaterial();
var time = new THREE.TimeNode();
var speed = new THREE.FloatNode(.5);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或