Skip to content

Commit 5b940eb

Browse files
redcamelredcamel
authored
Merge pull request #646 from redcamel/dev
릴리즈준비
2 parents 9311b33 + f83443f commit 5b940eb

File tree

108 files changed

+6368
-4229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+6368
-4229
lines changed

‎example/baseTestUI.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* RedGL - MIT License
33
* Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
* https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
* Last modification time of this file - 2019.4.30 19:52
5+
* Last modification time of this file - 2019.5.15 16:48
66
*/
77

88
var baseTestUI = function (redGL, width) {
@@ -157,6 +157,16 @@ baseTestUI.exampleList = [
157157
}
158158
]
159159
},
160+
{
161+
key: 'Program',
162+
list: [
163+
{
164+
key: 'testAutoProgram',
165+
href: 'program/testAutoProgram.html'
166+
}
167+
]
168+
},
169+
160170
{
161171
key: 'Controller',
162172
list: [
@@ -165,8 +175,8 @@ baseTestUI.exampleList = [
165175
href: 'camera/RedCamera.html'
166176
},
167177
{
168-
key: 'RedCamera(orthographicMode)',
169-
href: 'camera/RedCamera_ortho.html'
178+
key: 'RedCamera(mode2D)',
179+
href: 'camera/RedCamera_mode2D.html'
170180
},
171181
{
172182
key: 'RedBasicController',
@@ -371,11 +381,18 @@ baseTestUI.exampleList = [
371381
key: 'RedGLTFLoader_Multi_morphTarget',
372382
href: 'loader/gltf/RedGLTFLoader_Multi_morphTarget.html'
373383
},
374-
384+
{
385+
key: 'RedGLTFLoader_Multi_morphTarget_performance',
386+
href: 'loader/gltf/RedGLTFLoader_Multi_morphTarget_performance.html'
387+
},
375388
{
376389
key: 'RedGLTFLoader_skin',
377390
href: 'loader/gltf/RedGLTFLoader_skin.html'
378391
},
392+
{
393+
key: 'RedGLTFLoader_skin_performance',
394+
href: 'loader/gltf/RedGLTFLoader_skin_performance.html'
395+
},
379396
{
380397
key: 'RedGLTFLoader_hardTest',
381398
href: 'loader/gltf/RedGLTFLoader_hardTest.html'
@@ -399,8 +416,8 @@ baseTestUI.exampleList = [
399416
href: 'text/RedText.html'
400417
},
401418
{
402-
key: 'RedText(Orthogonal Mode)',
403-
href: 'text/RedCamera_ortho_text.html'
419+
key: 'RedText(mode2D)',
420+
href: 'text/RedText(mode2D).html'
404421
}
405422

406423
]
@@ -762,7 +779,7 @@ baseTestUI.prototype = {
762779
initCamera: function (camera, open) {
763780
var t0 = this['gui'].addFolder('camera')
764781
camera = camera instanceof RedCamera ? camera : camera.camera;
765-
t0.add(camera, 'orthographicYn', true, false);
782+
t0.add(camera, 'mode2DYn', true, false);
766783
t0.add(camera, 'nearClipping', 0, 20, 0.01);
767784
t0.add(camera, 'farClipping', 0, 10000, 0.01);
768785
t0.add(camera, 'fov', 0, 100, 0.01);

‎example/camera/RedBasicController.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
99
<html lang="ko">
1010
<head>
1111
<meta charset="UTF-8">
1212
<meta name="keywords" content="RedGL,webgl,demo">
13-
<title>RedGL - RedBasicController</title>
13+
<title>RedGL Example - RedBasicController</title>
1414
<meta name="apple-mobile-web-app-capable" content="yes"/>
1515
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1616
<meta name="viewport"

‎example/camera/RedBasicController_targetView.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
99
<html lang="ko">
1010
<head>
1111
<meta charset="UTF-8">
1212
<meta name="keywords" content="RedGL,webgl,demo">
13-
<title>RedGL - RedBasicController_targetView</title>
13+
<title>RedGL Example - RedBasicController_targetView</title>
1414
<meta name="apple-mobile-web-app-capable" content="yes"/>
1515
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1616
<meta name="viewport"

‎example/camera/RedCamera.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - RedCamera</title>
14+
<title>RedGL Example - RedCamera</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

‎example/camera/RedCamera_ortho.html renamed to ‎example/camera/RedCamera_mode2D.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.20 20:27
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - RedCamera(orthographic mode)</title>
14+
<title>RedGL Example - RedCamera(orthographic mode)</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"
@@ -59,7 +59,7 @@
5959
tScene = RedScene(redGL);
6060
// 카메라 생성
6161
tCamera = RedCamera();
62-
tCamera.orthographicYn = true
62+
tCamera.mode2DYn = true
6363
tCamera.x = 0;
6464
tCamera.y = 0;
6565
tCamera.z = 10;
@@ -80,7 +80,7 @@
8080
var self = this
8181
// Box 설정
8282
var tMesh;
83-
var i = 1000
83+
var i = 5000
8484
tMaterial = RedBitmapMaterial(this, RedBitmapTexture(this, assetPath + 'crate.png'))
8585
tMaterial2 = RedBitmapMaterial(this, RedBitmapTexture(this, assetPath + 'UV_Grid_Sm.jpg'))
8686

‎example/camera/RedObitController.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - RedObitController</title>
14+
<title>RedGL Example - RedObitController</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

‎example/camera/RedObitController_targetView.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - RedObitController_targetView</title>
14+
<title>RedGL Example - RedObitController_targetView</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

‎example/etc/Fog_example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - Fog</title>
14+
<title>RedGL Example - Fog</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

‎example/etc/LOD_example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.21 16:9
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - LOD</title>
14+
<title>RedGL Example - LOD</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

‎example/etc/RedGL.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
~ RedGL - MIT License
33
~ Copyright (c) 2018 - 2019 By RedCamel([email protected])
44
~ https://github.com/redcamel/RedGL2/blob/dev/LICENSE
5-
~ Last modification time of this file - 2019.4.30 18:52
5+
~ Last modification time of this file - 2019.5.15 16:50
66
-->
77

88
<!DOCTYPE html>
@@ -11,7 +11,7 @@
1111
<head>
1212
<meta charset="UTF-8">
1313
<meta name="keywords" content="RedGL,webgl,demo">
14-
<title>RedGL - RedGL</title>
14+
<title>RedGL Example - RedGL</title>
1515
<meta name="apple-mobile-web-app-capable" content="yes"/>
1616
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
1717
<meta name="viewport"

0 commit comments

Comments
 (0)