clean-up of shader text editor in-progress

KTRosenberg · Jan 23, 2020 · f47f658 · f47f658
1 parent 1a5a0d9
commit f47f658
Show file tree

Hide file tree

Showing 22 changed files with 218 additions and 356 deletions.
diff --git a/assets/shaders/dynamic_renderer/vertex_colors_default/fragment.frag.glsl b/assets/shaders/dynamic_renderer/vertex_colors_default/fragment.frag.glsl
@@ -1,6 +1,5 @@
 #version 300 es
 precision highp float;
-#include<pnoise>
 
 in vec3 vPos;
 in vec3 vWorldPos;

diff --git a/assets/shaders/dynamic_renderer/vertex_colors_default/vertex.vert.glsl b/assets/shaders/dynamic_renderer/vertex_colors_default/vertex.vert.glsl
@@ -1,8 +1,6 @@
 #version 300 es
 precision highp float;
 
-// debug line shader
-
 // input vertex
 layout(location = 0) in vec3 aPos;
 layout(location = 1) in vec4 aColor;

diff --git a/lib/core/metaroom.js b/lib/core/metaroom.js
@@ -5,7 +5,7 @@ import {MetaroomVRBackend} from "./webvr_backend.js";
 
 import {ServerPublishSubscribe} from "./event_pubsub.js";
 import {ViewpointController} from "./viewpoint_controller.js";
-import {Client} from "./object_sync_client.js";
+import {Client} from "./websocket_client.js";
 import {EventBus} from "./eventbus.js";
 
 // the "base" type

diff --git a/lib/core/object_sync_client.js b/lib/core/object_sync_client.js
diff --git a/lib/core/profile.js b/lib/core/profile.js
@@ -1,20 +1,11 @@
 "use strict";
 
-import {ShaderTextEditor} from "/lib/core/shader_text_editor.js";
-
 export default class Profile {
-    constructor(){
+    constructor() {
         this.RESOLUTION = document.getElementById("resolution").getAttribute("value").split(',');     
     }
 
-    main(){
-        ShaderTextEditor.enable();
-
-        ShaderTextEditor.init({
-            defaultShaderCompilationFunction : ShaderTextEditor.onNeedsCompilationDefault,
-            //externalWindowGetter : function() { return MR.engine.externalWindow; }
-        });
-
+    main() {
         MR.initWorldsScroll();
         MR.initPlayerViewSelectionScroll();
         MR.syncClient.connect(window.IP, window.PORT_SYNC);