Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
redcamel committed Jul 8, 2019
1 parent 3a569dc commit 3a63b6a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 50 deletions.
16 changes: 12 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
"directories": {
"example": "example"
},
"dependencies": {
"strip-comments": "^1.0.2"
},
"dependencies": {},
"devDependencies": {
"strip-comments": "^1.0.2",
"date-utils": "^1.2.21",
"gulp": "^4.0.0",
"gulp-concat": "^2.6.1",
Expand Down
46 changes: 11 additions & 35 deletions release/RedGL.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel(webseon@gmail.com)
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.7.5 11:51
* Last modification time of this file - 2019.4.30 18:57
*/

/*DOC:
Expand Down Expand Up @@ -3256,7 +3256,7 @@ var RedBaseTexture;
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel(webseon@gmail.com)
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.6.7 12:10
* Last modification time of this file - 2019.7.5 11:49
*/
"use strict";
var RedBaseObject3D;
Expand Down Expand Up @@ -19655,7 +19655,7 @@ var RedShader;
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel(webseon@gmail.com)
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.5.21 11:40
* Last modification time of this file - 2019.7.5 11:41
*/

"use strict";
Expand Down Expand Up @@ -21295,28 +21295,21 @@ var RedSystemUniformUpdater;
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel(webseon@gmail.com)
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.4.30 18:53
* Last modification time of this file - 2019.7.8 15:3
*/

"use strict";
var RedView;
(function () {
var ViewMap;
ViewMap = {};
/*DOC:
{
constructorYn : true,
title :`RedView`,
description : `
고유 키를 기반으로 <b>RedScene</b>과 <b>RedCamera를</b> 쌍으로 하는 정보를 소유.
<b>RedScene</b>과 <b>RedCamera를</b> 쌍으로 하는 정보를 소유.
<b>RedWorld</b>에 등록되어지며 실제 렌더링시 필요한 그려질 <b>크기</b>와 <b>위치</b>를 결정한다.
`,
params : {
key :[
{type:'String'},
'고유키',
'key만 입력시에 기존에 존재하는 키일경우 <b>캐쉬된 Instance</b>를 반환'
],
redGL : [
{type:'RedGL'},
],
Expand All @@ -21332,34 +21325,18 @@ var RedView;
demo : '../example/etc/RedView.html',
example : `
var tWorld;
RedView('테스트뷰1', RedGL Instance, RedScene Instance, RedCamera Instance); // "테스트뷰1" 라는 키값을 가진 RedView 생성
RedView('테스트뷰2', RedGL Instance, RedScene Instance, RedCamera Instance); // "테스트뷰2" 라는 키값을 가진 RedView 생성
RedView( RedGL Instance, RedScene Instance, RedCamera Instance); // "테스트뷰1" 라는 키값을 가진 RedView 생성
RedView( RedGL Instance, RedScene Instance, RedCamera Instance); // "테스트뷰2" 라는 키값을 가진 RedView 생성
`,
return : 'RedView Instance'
}
:DOC*/
RedView = function (key, redGL, scene, camera) {
if (ViewMap[key]) {
if (scene || camera) RedGLUtil.throwFunc('RedView : ' + key, '는 이미 생성된 RedView key입니다.', '입력값 : ' + key);
else return ViewMap[key];
}
redGL instanceof RedGL || RedGLUtil.throwFunc('RedScene : RedGL Instance만 허용.', redGL);
if (!(this instanceof RedView)) return new RedView(key, redGL, scene, camera);
typeof key == 'string' || RedGLUtil.throwFunc('RedView : key : 문자열만 허용', '입력값 : ' + key);
if (!scene && !camera) RedGLUtil.throwFunc('RedView : 존재하지 않는 key입니다.', '입력값 : ' + key);
RedView = function (redGL, scene, camera) {
if (!(this instanceof RedView)) return new RedView(redGL, scene, camera);
if (scene && !(scene instanceof RedScene)) RedGLUtil.throwFunc('RedView : RedScene Instance만 허용', '입력값 : ' + scene);
if (camera) {
if (camera && !(camera instanceof RedCamera) && !(camera instanceof RedBaseController)) RedGLUtil.throwFunc('RedView : RedCamera or XXController Instance만 허용');
} else RedGLUtil.throwFunc('RedView : RedCamera or XXController Instance만 허용', '입력값 : ' + camera);
/*DOC:
{
code : 'PROPERTY',
title :`key`,
description : `고유키`,
return : 'String'
}
:DOC*/
this['key'] = key;
/*DOC:
{
code : 'PROPERTY',
Expand Down Expand Up @@ -21396,7 +21373,6 @@ var RedView;
this['_y'] = 0;
this['_viewRect'] = [0, 0, 0, 0];
this['_UUID'] = RedGL.makeUUID();
ViewMap[key] = this;
console.log(this);
};
RedView.prototype = {
Expand Down Expand Up @@ -21486,7 +21462,7 @@ var RedView;
* RedGL - MIT License
* Copyright (c) 2018 - 2019 By RedCamel(webseon@gmail.com)
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
* Last modification time of this file - 2019.4.30 18:53
* Last modification time of this file - 2019.7.8 16:20
*/

"use strict";
Expand Down Expand Up @@ -27402,4 +27378,4 @@ var RedGLOffScreen;
};
RedWorkerCode = RedWorkerCode.toString().replace(/^function ?. ?\) ?\{|\}\;?$/g, '');
})();
})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2019-07-08 16:23:45)' };console.log(RedGL_VERSION);
})();var RedGL_VERSION = {version : 'RedGL Release. last update( 2019-07-08 23:29:09)' };console.log(RedGL_VERSION);
9 changes: 1 addition & 8 deletions release/RedGL.min.js

Large diffs are not rendered by default.

0 comments on commit 3a63b6a

Please sign in to comment.