From f743e41af0b2cc8f53ef99b90834ecb657173607 Mon Sep 17 00:00:00 2001 From: -=ybafelo Date: Tue, 24 Jul 2018 15:04:04 +0200 Subject: [PATCH] cleanup --- src/r3-a-component-a.js | 204 ++++++++++++++++++++-------------------- src/r3-api-socket-0.js | 19 ---- 2 files changed, 102 insertions(+), 121 deletions(-) diff --git a/src/r3-a-component-a.js b/src/r3-a-component-a.js index f3deef9..08d52e1 100644 --- a/src/r3-a-component-a.js +++ b/src/r3-a-component-a.js @@ -237,110 +237,110 @@ R3.Component.prototype.toString = function() { return this.id; }; -R3.Component.SOCKET_RECEIVE = 0x1; -R3.Component.MATERIAL_STANDARD = 0x2; -R3.Component.RENDERER = 0x3; -R3.Component.SERVER = 0x4; -R3.Component.CAMERA_PERSPECTIVE = 0x5; -R3.Component.SOCKET = 0x6; -R3.Component.MESH = 0x7; -R3.Component.SPLINE = 0x8; -R3.Component.SHADOW_DIRECTIONAL = 0x9; -R3.Component.PLANE = 0xa; -R3.Component.COMPOSER = 0xb; -R3.Component.RENDER_TARGET = 0xc; -R3.Component.PASS_RENDER = 0xd; -R3.Component.SCENE = 0xe; -R3.Component.RAYCASTER = 0xf; -R3.Component.TEXT = 0x10; -R3.Component.FACE = 0x11; -R3.Component.VIEWPORT = 0x12; -R3.Component.SYSTEM = 0x13; -R3.Component.GRAPHICS = 0x14; -R3.Component.HELPER = 0x15; -R3.Component.CUSTOM_CODE = 0x16; -R3.Component.MOUSE = 0x17; -R3.Component.SKELETON = 0x18; -R3.Component.TEXTURE_IMAGE = 0x19; -R3.Component.ENTITY_MANAGER = 0x1a; -R3.Component.DOM_ELEMENT = 0x1b; -R3.Component.SHADOW_SPOT = 0x1c; -R3.Component.STATS = 0x1d; -R3.Component.GUI = 0x1e; -R3.Component.IMAGE = 0x1f; -R3.Component.ENTITY = 0x20; -R3.Component.OBJECT = 0x21; -R3.Component.RENDERER_D2 = 0x22; -R3.Component.RENDERER_D3 = 0x23; -R3.Component.PHYSICS_WORLD = 0x24; -R3.Component.BROADPHASE = 0x25; -R3.Component.SOLVER = 0x26; -R3.Component.RIGID_BODY = 0x27; -R3.Component.SHAPE = 0x28; -R3.Component.SHAPE_BOX = 0x29; -R3.Component.SHAPE_SPHERE = 0x2a; -R3.Component.SHAPE_TRI_MESH = 0x2b; -R3.Component.SHAPE_CONVEX_HULL = 0x2c; -R3.Component.SHAPE_CONVEX_HULL_CYLINDER = 0x2d; -R3.Component.SHAPE_HEIGHT_MAP = 0x2e; -R3.Component.SHAPE_PLANE = 0x2f; -R3.Component.CONTROLS = 0x30; -R3.Component.CONTROLS_EDITOR = 0x31; +R3.Component.SOCKET_RECEIVE = 0x1; +R3.Component.MATERIAL_STANDARD = 0x2; +R3.Component.RENDERER = 0x3; +R3.Component.SERVER = 0x4; +R3.Component.CAMERA_PERSPECTIVE = 0x5; +R3.Component.SOCKET = 0x6; +R3.Component.MESH = 0x7; +R3.Component.SPLINE = 0x8; +R3.Component.SHADOW_DIRECTIONAL = 0x9; +R3.Component.PLANE = 0xa; +R3.Component.COMPOSER = 0xb; +R3.Component.RENDER_TARGET = 0xc; +R3.Component.PASS_RENDER = 0xd; +R3.Component.SCENE = 0xe; +R3.Component.RAYCASTER = 0xf; +R3.Component.TEXT = 0x10; +R3.Component.FACE = 0x11; +R3.Component.VIEWPORT = 0x12; +R3.Component.SYSTEM = 0x13; +R3.Component.GRAPHICS = 0x14; +R3.Component.HELPER = 0x15; +R3.Component.CUSTOM_CODE = 0x16; +R3.Component.MOUSE = 0x17; +R3.Component.SKELETON = 0x18; +R3.Component.TEXTURE_IMAGE = 0x19; +R3.Component.ENTITY_MANAGER = 0x1a; +R3.Component.DOM_ELEMENT = 0x1b; +R3.Component.SHADOW_SPOT = 0x1c; +R3.Component.STATS = 0x1d; +R3.Component.GUI = 0x1e; +R3.Component.IMAGE = 0x1f; +R3.Component.ENTITY = 0x20; +R3.Component.OBJECT = 0x21; +R3.Component.RENDERER_D2 = 0x22; +R3.Component.RENDERER_D3 = 0x23; +R3.Component.PHYSICS_WORLD = 0x24; +R3.Component.BROADPHASE = 0x25; +R3.Component.SOLVER = 0x26; +R3.Component.RIGID_BODY = 0x27; +R3.Component.SHAPE = 0x28; +R3.Component.SHAPE_BOX = 0x29; +R3.Component.SHAPE_SPHERE = 0x2a; +R3.Component.SHAPE_TRI_MESH = 0x2b; +R3.Component.SHAPE_CONVEX_HULL = 0x2c; +R3.Component.SHAPE_CONVEX_HULL_CYLINDER = 0x2d; +R3.Component.SHAPE_HEIGHT_MAP = 0x2e; +R3.Component.SHAPE_PLANE = 0x2f; +R3.Component.CONTROLS = 0x30; +R3.Component.CONTROLS_EDITOR = 0x31; R3.Component.CONTROLS_TOUCH = 0x32; -R3.Component.FRICTION_MATERIAL = 0x33; -R3.Component.FRICTION_CONTACT_MATERIAL = 0x34; -R3.Component.RAYCAST_VEHICLE = 0x35; -R3.Component.RAYCAST_WHEEL = 0x36; -R3.Component.CLOCK = 0x37; -R3.Component.ANIMATION = 0x38; -R3.Component.CONTROLS_KEYBOARD = 0x39; +R3.Component.FRICTION_MATERIAL = 0x33; +R3.Component.FRICTION_CONTACT_MATERIAL = 0x34; +R3.Component.RAYCAST_VEHICLE = 0x35; +R3.Component.RAYCAST_WHEEL = 0x36; +R3.Component.CLOCK = 0x37; +R3.Component.ANIMATION = 0x38; +R3.Component.CONTROLS_KEYBOARD = 0x39; R3.Component.CONTROLS_MOUSE = 0x3a; -R3.Component.GRAPHICS_THREE = 0x3b; -R3.Component.FONT = 0x3c; -R3.Component.CANVAS = 0x3d; -R3.Component.BONE = 0x3e; -R3.Component.GRAPHICS_IMPACT = 0x3f; -R3.Component.CONTROLS_FIRST_PERSON = 0x40; -R3.Component.SYSTEM_ANIMATION = 0x41; -R3.Component.SYSTEM_CUSTOM_CODE = 0x42; -R3.Component.SYSTEM_GUI = 0x43; -R3.Component.SYSTEM_INPUT = 0x44; -R3.Component.SYSTEM_LINKING = 0x45; -R3.Component.SYSTEM_PHYSICS = 0x46; -R3.Component.SYSTEM_RENDER = 0x47; -R3.Component.SYSTEM_STORAGE = 0x48; -R3.Component.SYSTEM_VISUALIZATION = 0x49; -R3.Component.LIGHT_AMBIENT = 0x4a; -R3.Component.LIGHT_DIRECTIONAL = 0x4b; -R3.Component.LIGHT_HEMISPHERE = 0x4c; -R3.Component.LIGHT_POINT = 0x4d; -R3.Component.LIGHT_RECT_AREA = 0x4e; -R3.Component.LIGHT_SPOT = 0x4f; -R3.Component.FOG = 0x50; -R3.Component.CONTROLS_ORBIT = 0x51; -R3.Component.PARTICLE_ENGINE = 0x52; -R3.Component.SYSTEM_PARTICLE = 0x53; -R3.Component.PARTICLE = 0x54; -R3.Component.AUDIO = 0x55; -R3.Component.SYSTEM_AUDIO = 0x56; -R3.Component.SOCKET_CAST = 0x57; -R3.Component.CAMERA_ORTHOGRAPHIC = 0x58; -R3.Component.CAMERA_STEREO = 0x59; -R3.Component.CAMERA_CUBE = 0x5a; -R3.Component.SHADOW = 0x5b; -R3.Component.RENDER_TARGET_CUBE = 0x5c; -R3.Component.TEXTURE_CUBE = 0x5d; -R3.Component.TEXTURE_CANVAS = 0x5e; -R3.Component.EFFECT_STEREO = 0x5f; -R3.Component.EFFECT_ANAGLYPH = 0x60; -R3.Component.EFFECT_PARALLAX = 0x61; -R3.Component.PASS_SSAO = 0x62; -R3.Component.PASS_BLOOM = 0x63; -R3.Component.PASS_FXAA = 0x64; -R3.Component.RENDER_CONFIGURATION = 0x65; -R3.Component.MATERIAL_BASIC = 0x66; -R3.Component.TEXTURE = 0x67; -R3.Component.MATERIAL_PHONG = 0x68; +R3.Component.GRAPHICS_THREE = 0x3b; +R3.Component.FONT = 0x3c; +R3.Component.CANVAS = 0x3d; +R3.Component.BONE = 0x3e; +R3.Component.GRAPHICS_IMPACT = 0x3f; +R3.Component.CONTROLS_FIRST_PERSON = 0x40; +R3.Component.SYSTEM_ANIMATION = 0x41; +R3.Component.SYSTEM_CUSTOM_CODE = 0x42; +R3.Component.SYSTEM_GUI = 0x43; +R3.Component.SYSTEM_INPUT = 0x44; +R3.Component.SYSTEM_LINKING = 0x45; +R3.Component.SYSTEM_PHYSICS = 0x46; +R3.Component.SYSTEM_RENDER = 0x47; +R3.Component.SYSTEM_STORAGE = 0x48; +R3.Component.SYSTEM_VISUALIZATION = 0x49; +R3.Component.LIGHT_AMBIENT = 0x4a; +R3.Component.LIGHT_DIRECTIONAL = 0x4b; +R3.Component.LIGHT_HEMISPHERE = 0x4c; +R3.Component.LIGHT_POINT = 0x4d; +R3.Component.LIGHT_RECT_AREA = 0x4e; +R3.Component.LIGHT_SPOT = 0x4f; +R3.Component.FOG = 0x50; +R3.Component.CONTROLS_ORBIT = 0x51; +R3.Component.PARTICLE_ENGINE = 0x52; +R3.Component.SYSTEM_PARTICLE = 0x53; +R3.Component.PARTICLE = 0x54; +R3.Component.AUDIO = 0x55; +R3.Component.SYSTEM_AUDIO = 0x56; +R3.Component.SOCKET_CAST = 0x57; +R3.Component.CAMERA_ORTHOGRAPHIC = 0x58; +R3.Component.CAMERA_STEREO = 0x59; +R3.Component.CAMERA_CUBE = 0x5a; +R3.Component.SHADOW = 0x5b; +R3.Component.RENDER_TARGET_CUBE = 0x5c; +R3.Component.TEXTURE_CUBE = 0x5d; +R3.Component.TEXTURE_CANVAS = 0x5e; +R3.Component.EFFECT_STEREO = 0x5f; +R3.Component.EFFECT_ANAGLYPH = 0x60; +R3.Component.EFFECT_PARALLAX = 0x61; +R3.Component.PASS_SSAO = 0x62; +R3.Component.PASS_BLOOM = 0x63; +R3.Component.PASS_FXAA = 0x64; +R3.Component.RENDER_CONFIGURATION = 0x65; +R3.Component.MATERIAL_BASIC = 0x66; +R3.Component.TEXTURE = 0x67; +R3.Component.MATERIAL_PHONG = 0x68; R3.Component.GEOMETRY_NORMAL = 0x69; R3.Component.GEOMETRY_NORMAL_BOX = 0x6a; diff --git a/src/r3-api-socket-0.js b/src/r3-api-socket-0.js index 49c9b23..dd2796c 100644 --- a/src/r3-api-socket-0.js +++ b/src/r3-api-socket-0.js @@ -76,22 +76,3 @@ R3.API.Socket.prototype.constructor = R3.API.Socket; R3.API.Socket.TYPE_NONE = 0x1; R3.API.Socket.TYPE_CAST = 0x2; R3.API.Socket.TYPE_RECEIVE = 0x3; - -/** - * Creates an API Socket from an Object Socket - * @param objectSocket - * @constructor - */ -R3.API.Socket.FromObject = function(objectSocket) { - - return new R3.API.Socket( - objectSocket.id, - objectSocket.name, - objectSocket.socketType, - objectSocket.roomId, - objectSocket.peerId, - objectSocket.server, - objectSocket.parentEntity - ); - -};