修改 设备编码

master
wanghao 7 months ago
parent 47def71da4
commit 1a3d30b7e8

@ -207,6 +207,7 @@
<module>ruoyi-common</module> <module>ruoyi-common</module>
<module>ruoyi-manage</module> <module>ruoyi-manage</module>
<module>ruoyi-api</module> <module>ruoyi-api</module>
<module>ruoyi-device</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>

@ -16,7 +16,11 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-device</artifactId>
<version>4.7.8</version>
</dependency>
<!-- SpringBoot集成thymeleaf模板 --> <!-- SpringBoot集成thymeleaf模板 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

@ -1,9 +1,12 @@
package com.ruoyi.web.controller.common; package com.ruoyi.web.controller.common;
import java.util.ArrayList; import com.ruoyi.common.config.RuoYiConfig;
import java.util.List; import com.ruoyi.common.config.ServerConfig;
import javax.servlet.http.HttpServletRequest; import com.ruoyi.common.constant.Constants;
import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -14,13 +17,11 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.config.ServerConfig; import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.constant.Constants; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.AjaxResult; import java.util.ArrayList;
import com.ruoyi.common.utils.StringUtils; import java.util.List;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
/** /**
* *

@ -1,19 +1,20 @@
package com.ruoyi.web.controller.demo.controller; package com.ruoyi.web.controller.demo.controller;
import java.util.ArrayList;
import java.util.List;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.CxSelect; import com.ruoyi.common.core.domain.CxSelect;
import com.ruoyi.common.json.JSONObject; import com.ruoyi.common.json.JSONObject;
import com.ruoyi.common.json.JSONObject.JSONArray; import com.ruoyi.common.json.JSONObject.JSONArray;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.List;
/** /**
* *

@ -1,17 +1,5 @@
package com.ruoyi.web.controller.demo.controller; package com.ruoyi.web.controller.demo.controller;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.PageDomain;
@ -23,6 +11,15 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.web.controller.demo.domain.CustomerModel; import com.ruoyi.web.controller.demo.domain.CustomerModel;
import com.ruoyi.web.controller.demo.domain.UserOperateModel; import com.ruoyi.web.controller.demo.domain.UserOperateModel;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.demo.controller; package com.ruoyi.web.controller.demo.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.ColumnType;
@ -23,6 +12,14 @@ import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.*;
/** /**
* *

@ -1,9 +1,10 @@
package com.ruoyi.web.controller.demo.domain; package com.ruoyi.web.controller.demo.domain;
import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.List;
/** /**
* *
* *

@ -1,9 +1,10 @@
package com.ruoyi.web.controller.demo.domain; package com.ruoyi.web.controller.demo.domain;
import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/** /**
* *
* *

@ -1,11 +1,12 @@
package com.ruoyi.web.controller.demo.domain; package com.ruoyi.web.controller.demo.domain;
import java.util.Date;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import java.util.Date;
public class UserOperateModel extends BaseEntity public class UserOperateModel extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

@ -1,5 +1,8 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.service.CacheService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -8,9 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.service.CacheService;
/** /**
* *

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import com.ruoyi.common.core.controller.BaseController;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
/** /**
* druid * druid

@ -1,12 +1,12 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.framework.web.domain.Server;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.framework.web.domain.Server;
/** /**
* *

@ -1,7 +1,14 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.List; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -9,14 +16,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import java.util.List;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
/** /**
* 访 * 访

@ -1,15 +1,5 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -18,6 +8,13 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService; import com.ruoyi.system.service.ISysOperLogService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,14 +1,5 @@
package com.ruoyi.web.controller.monitor; package com.ruoyi.web.controller.monitor;
import java.util.List;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -21,6 +12,16 @@ import com.ruoyi.framework.shiro.session.OnlineSession;
import com.ruoyi.framework.shiro.session.OnlineSessionDAO; import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService; import com.ruoyi.system.service.ISysUserOnlineService;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/** /**
* 线 * 线

@ -1,20 +1,21 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.awt.image.BufferedImage; import com.google.code.kaptcha.Constants;
import java.io.IOException; import com.google.code.kaptcha.Producer;
import com.ruoyi.common.core.controller.BaseController;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller; import java.awt.image.BufferedImage;
import org.springframework.web.bind.annotation.GetMapping; import java.io.IOException;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.core.controller.BaseController;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -19,6 +8,14 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
@ -20,6 +9,14 @@ import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -19,6 +8,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -20,6 +9,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysDictTypeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.Date;
import java.util.List;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.constant.ShiroConstants;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
@ -25,6 +14,18 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List;
/** /**
* *

@ -1,7 +1,11 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import javax.servlet.http.HttpServletRequest; import com.ruoyi.common.core.controller.BaseController;
import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.ConfigService;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.UsernamePasswordToken;
@ -13,12 +17,9 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.core.text.Convert; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.ConfigService;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -21,6 +10,14 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.framework.shiro.util.AuthorizationUtils; import com.ruoyi.framework.shiro.util.AuthorizationUtils;
import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysMenuService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -18,6 +7,14 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService; import com.ruoyi.system.service.ISysNoticeService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -19,6 +8,14 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
@ -24,6 +13,13 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
/** /**
* *

@ -1,16 +1,16 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.shiro.service.SysRegisterService; import com.ruoyi.framework.shiro.service.SysRegisterService;
import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
/** /**
* *

@ -1,16 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -25,6 +14,14 @@ import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* *

@ -1,19 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -33,6 +19,17 @@ import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* *

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.tool; package com.ruoyi.web.controller.tool;
import com.ruoyi.common.core.controller.BaseController;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
/** /**
* build * build

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.tool; package com.ruoyi.web.controller.tool;
import com.ruoyi.common.core.controller.BaseController;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.controller.BaseController;
/** /**
* swagger * swagger

@ -1,26 +1,15 @@
package com.ruoyi.web.controller.tool; package com.ruoyi.web.controller.tool;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
/** /**
* swagger * swagger

@ -1,10 +1,10 @@
package com.ruoyi.web.core.config; package com.ruoyi.web.core.config;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.ruoyi.common.config.RuoYiConfig;
import io.swagger.annotations.ApiOperation;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;

@ -1,10 +1,10 @@
import { import {
AnimationClip, AnimationClip,
BooleanKeyframeTrack, BooleanKeyframeTrack,
ColorKeyframeTrack, ColorKeyframeTrack,
NumberKeyframeTrack, NumberKeyframeTrack,
Vector3, Vector3,
VectorKeyframeTrack VectorKeyframeTrack
} from 'three'; } from 'three';
class AnimationClipCreator { class AnimationClipCreator {

@ -1,16 +1,16 @@
import { import {
BufferAttribute, BufferAttribute,
BufferGeometry, BufferGeometry,
Color, Color,
Line, Line,
LineBasicMaterial, LineBasicMaterial,
Matrix4, Matrix4,
Mesh, Mesh,
MeshBasicMaterial, MeshBasicMaterial,
Object3D, Object3D,
Quaternion, Quaternion,
SphereGeometry, SphereGeometry,
Vector3 Vector3
} from 'three'; } from 'three';
const _q = new Quaternion(); const _q = new Quaternion();

@ -1,11 +1,6 @@
import { import {AnimationMixer, Object3D, Quaternion, Vector3} from 'three';
AnimationMixer, import {CCDIKSolver} from '../animation/CCDIKSolver.js';
Object3D, import {MMDPhysics} from '../animation/MMDPhysics.js';
Quaternion,
Vector3
} from 'three';
import { CCDIKSolver } from '../animation/CCDIKSolver.js';
import { MMDPhysics } from '../animation/MMDPhysics.js';
/** /**
* MMDAnimationHelper handles animation of MMD assets loaded by MMDLoader * MMDAnimationHelper handles animation of MMD assets loaded by MMDLoader

@ -1,16 +1,16 @@
import { import {
Bone, Bone,
BoxGeometry, BoxGeometry,
CapsuleGeometry, CapsuleGeometry,
Color, Color,
Euler, Euler,
Matrix4, Matrix4,
Mesh, Mesh,
MeshBasicMaterial, MeshBasicMaterial,
Object3D, Object3D,
Quaternion, Quaternion,
SphereGeometry, SphereGeometry,
Vector3 Vector3
} from 'three'; } from 'three';
/** /**

@ -1,15 +1,15 @@
import { import {
Mesh, Mesh,
OrthographicCamera, OrthographicCamera,
PerspectiveCamera, PerspectiveCamera,
PlaneGeometry, PlaneGeometry,
Scene, Scene,
ShaderMaterial, ShaderMaterial,
UniformsUtils, UniformsUtils,
WebGLRenderTarget WebGLRenderTarget
} from 'three'; } from 'three';
import { BokehShader, BokehDepthShader } from '../shaders/BokehShader2.js'; import {BokehDepthShader, BokehShader} from '../shaders/BokehShader2.js';
class CinematicCamera extends PerspectiveCamera { class CinematicCamera extends PerspectiveCamera {

@ -1,19 +1,19 @@
import { import {
GridHelper, Box3,
EllipseCurve, BufferGeometry,
BufferGeometry, EllipseCurve,
Line, EventDispatcher,
LineBasicMaterial, GridHelper,
Raycaster, Group,
Group, Line,
Box3, LineBasicMaterial,
Sphere, MathUtils,
Quaternion, Matrix4,
Vector2, Quaternion,
Vector3, Raycaster,
Matrix4, Sphere,
MathUtils, Vector2,
EventDispatcher Vector3
} from 'three'; } from 'three';
//trackball state //trackball state

@ -1,11 +1,4 @@
import { import {EventDispatcher, Matrix4, Plane, Raycaster, Vector2, Vector3} from 'three';
EventDispatcher,
Matrix4,
Plane,
Raycaster,
Vector2,
Vector3
} from 'three';
const _plane = new Plane(); const _plane = new Plane();
const _raycaster = new Raycaster(); const _raycaster = new Raycaster();

@ -1,8 +1,4 @@
import { import {MathUtils, Spherical, Vector3} from 'three';
MathUtils,
Spherical,
Vector3
} from 'three';
const _lookDirection = new Vector3(); const _lookDirection = new Vector3();
const _spherical = new Spherical(); const _spherical = new Spherical();

@ -1,8 +1,4 @@
import { import {EventDispatcher, Quaternion, Vector3} from 'three';
EventDispatcher,
Quaternion,
Vector3
} from 'three';
const _changeEvent = { type: 'change' }; const _changeEvent = { type: 'change' };

@ -1,6 +1,6 @@
import { MOUSE, TOUCH } from 'three'; import {MOUSE, TOUCH} from 'three';
import { OrbitControls } from './OrbitControls.js'; import {OrbitControls} from './OrbitControls.js';
// MapControls performs orbiting, dollying (zooming), and panning. // MapControls performs orbiting, dollying (zooming), and panning.
// Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default). // Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default).

@ -1,14 +1,14 @@
import { import {
EventDispatcher, EventDispatcher,
MOUSE, MathUtils,
Quaternion, MOUSE,
Spherical, Plane,
TOUCH, Quaternion,
Vector2, Ray,
Vector3, Spherical,
Plane, TOUCH,
Ray, Vector2,
MathUtils Vector3
} from '/js/three/src/Three.js'; } from '/js/three/src/Three.js';
// OrbitControls performs orbiting, dollying (zooming), and panning. // OrbitControls performs orbiting, dollying (zooming), and panning.

@ -1,8 +1,4 @@
import { import {Euler, EventDispatcher, Vector3} from 'three';
Euler,
EventDispatcher,
Vector3
} from 'three';
const _euler = new Euler( 0, 0, 0, 'YXZ' ); const _euler = new Euler( 0, 0, 0, 'YXZ' );
const _vector = new Vector3(); const _vector = new Vector3();

@ -1,11 +1,4 @@
import { import {EventDispatcher, MathUtils, MOUSE, Quaternion, Vector2, Vector3} from 'three';
EventDispatcher,
MathUtils,
MOUSE,
Quaternion,
Vector2,
Vector3
} from 'three';
const _changeEvent = { type: 'change' }; const _changeEvent = { type: 'change' };
const _startEvent = { type: 'start' }; const _startEvent = { type: 'start' };

@ -1,23 +1,23 @@
import { import {
BoxGeometry, BoxGeometry,
BufferGeometry, BufferGeometry,
CylinderGeometry, CylinderGeometry,
DoubleSide, DoubleSide,
Euler, Euler,
Float32BufferAttribute, Float32BufferAttribute,
Line, Line,
LineBasicMaterial, LineBasicMaterial,
Matrix4, Matrix4,
Mesh, Mesh,
MeshBasicMaterial, MeshBasicMaterial,
Object3D, Object3D,
OctahedronGeometry, OctahedronGeometry,
PlaneGeometry, PlaneGeometry,
Quaternion, Quaternion,
Raycaster, Raycaster,
SphereGeometry, SphereGeometry,
TorusGeometry, TorusGeometry,
Vector3 Vector3
} from 'three'; } from 'three';
const _raycaster = new Raycaster(); const _raycaster = new Raycaster();

@ -1,14 +1,6 @@
import { import {Box3, DirectionalLight, MathUtils, Matrix4, ShaderChunk, Vector2, Vector3} from 'three';
Vector2, import {CSMFrustum} from './CSMFrustum.js';
Vector3, import {CSMShader} from './CSMShader.js';
DirectionalLight,
MathUtils,
ShaderChunk,
Matrix4,
Box3
} from 'three';
import { CSMFrustum } from './CSMFrustum.js';
import { CSMShader } from './CSMShader.js';
const _cameraToLightMatrix = new Matrix4(); const _cameraToLightMatrix = new Matrix4();
const _lightSpaceFrustum = new CSMFrustum(); const _lightSpaceFrustum = new CSMFrustum();

@ -1,4 +1,4 @@
import { Vector3, Matrix4 } from 'three'; import {Matrix4, Vector3} from 'three';
const inverseProjectionMatrix = new Matrix4(); const inverseProjectionMatrix = new Matrix4();

@ -1,15 +1,15 @@
import { import {
Group, Box3,
Mesh, Box3Helper,
LineSegments, BufferAttribute,
BufferGeometry, BufferGeometry,
LineBasicMaterial, DoubleSide,
Box3Helper, Group,
Box3, LineBasicMaterial,
PlaneGeometry, LineSegments,
MeshBasicMaterial, Mesh,
BufferAttribute, MeshBasicMaterial,
DoubleSide PlaneGeometry
} from 'three'; } from 'three';
class CSMHelper extends Group { class CSMHelper extends Group {

@ -1,4 +1,4 @@
import { ShaderChunk } from 'three'; import {ShaderChunk} from 'three';
const CSMShader = { const CSMShader = {
lights_fragment_begin: /* glsl */` lights_fragment_begin: /* glsl */`

@ -1,7 +1,4 @@
import { import {Curve, Vector3} from 'three';
Curve,
Vector3
} from 'three';
/** /**
* A bunch of parametric curves * A bunch of parametric curves

@ -1,8 +1,4 @@
import { import {Curve, Vector3, Vector4} from 'three';
Curve,
Vector3,
Vector4
} from 'three';
import * as NURBSUtils from '../curves/NURBSUtils.js'; import * as NURBSUtils from '../curves/NURBSUtils.js';
/** /**

@ -1,6 +1,4 @@
import { import {Vector4} from 'three';
Vector4
} from 'three';
import * as NURBSUtils from '../curves/NURBSUtils.js'; import * as NURBSUtils from '../curves/NURBSUtils.js';
/** /**

@ -1,7 +1,4 @@
import { import {Vector3, Vector4} from 'three';
Vector3,
Vector4
} from 'three';
/** /**
* NURBS utils * NURBS utils

@ -1,6 +1,4 @@
import { import {Vector4} from 'three';
Vector4
} from 'three';
import * as NURBSUtils from '../curves/NURBSUtils.js'; import * as NURBSUtils from '../curves/NURBSUtils.js';
/** /**

@ -1,15 +1,15 @@
import { import {
LinearFilter, LinearFilter,
Matrix3, Matrix3,
Mesh, Mesh,
NearestFilter, NearestFilter,
OrthographicCamera, OrthographicCamera,
PlaneGeometry, PlaneGeometry,
RGBAFormat, RGBAFormat,
Scene, Scene,
ShaderMaterial, ShaderMaterial,
StereoCamera, StereoCamera,
WebGLRenderTarget WebGLRenderTarget
} from 'three'; } from 'three';
class AnaglyphEffect { class AnaglyphEffect {

@ -1,10 +1,4 @@
import { import {BackSide, Color, ShaderMaterial, UniformsLib, UniformsUtils} from 'three';
BackSide,
Color,
ShaderMaterial,
UniformsLib,
UniformsUtils
} from 'three';
/** /**
* Reference: https://en.wikipedia.org/wiki/Cel_shading * Reference: https://en.wikipedia.org/wiki/Cel_shading

@ -1,14 +1,14 @@
import { import {
LinearFilter, LinearFilter,
Mesh, Mesh,
NearestFilter, NearestFilter,
OrthographicCamera, OrthographicCamera,
PlaneGeometry, PlaneGeometry,
RGBAFormat, RGBAFormat,
Scene, Scene,
ShaderMaterial, ShaderMaterial,
StereoCamera, StereoCamera,
WebGLRenderTarget WebGLRenderTarget
} from 'three'; } from 'three';
class ParallaxBarrierEffect { class ParallaxBarrierEffect {

@ -1,8 +1,4 @@
import { import {PerspectiveCamera, Quaternion, Vector3} from 'three';
PerspectiveCamera,
Quaternion,
Vector3
} from 'three';
/** /**
* peppers ghost effect based on http://www.instructables.com/id/Reflective-Prism/?ALLSTEPS * peppers ghost effect based on http://www.instructables.com/id/Reflective-Prism/?ALLSTEPS

@ -1,7 +1,4 @@
import { import {StereoCamera, Vector2} from 'three';
StereoCamera,
Vector2
} from 'three';
class StereoEffect { class StereoEffect {

@ -1,12 +1,4 @@
import { import {BackSide, BoxGeometry, Mesh, MeshLambertMaterial, MeshStandardMaterial, PointLight, Scene,} from 'three';
BackSide,
BoxGeometry,
Mesh,
MeshLambertMaterial,
MeshStandardMaterial,
PointLight,
Scene,
} from 'three';
class DebugEnvironment extends Scene { class DebugEnvironment extends Scene {

@ -2,15 +2,7 @@
* https://github.com/google/model-viewer/blob/master/packages/model-viewer/src/three-components/EnvironmentScene.ts * https://github.com/google/model-viewer/blob/master/packages/model-viewer/src/three-components/EnvironmentScene.ts
*/ */
import { import {BackSide, BoxGeometry, Mesh, MeshBasicMaterial, MeshStandardMaterial, PointLight, Scene,} from 'three';
BackSide,
BoxGeometry,
Mesh,
MeshBasicMaterial,
MeshStandardMaterial,
PointLight,
Scene,
} from 'three';
class RoomEnvironment extends Scene { class RoomEnvironment extends Scene {

@ -1,4 +1,4 @@
import { Color } from 'three'; import {Color} from 'three';
/** /**
* Export draco compressed files from threejs geometry objects. * Export draco compressed files from threejs geometry objects.

@ -5,12 +5,7 @@
* https://www.openexr.com/documentation/openexrfilelayout.pdf * https://www.openexr.com/documentation/openexrfilelayout.pdf
*/ */
import { import {DataUtils, FloatType, HalfFloatType, RGBAFormat,} from 'three';
FloatType,
HalfFloatType,
RGBAFormat,
DataUtils,
} from 'three';
import * as fflate from '../libs/fflate.module.js'; import * as fflate from '../libs/fflate.module.js';
const textEncoder = new TextEncoder(); const textEncoder = new TextEncoder();

@ -1,32 +1,32 @@
import { import {
BufferAttribute, BufferAttribute,
ClampToEdgeWrapping, ClampToEdgeWrapping,
Color, Color,
DoubleSide, CompressedTexture,
InterpolateDiscrete, DoubleSide,
InterpolateLinear, InterpolateDiscrete,
NoColorSpace, InterpolateLinear,
LinearFilter, LinearFilter,
LinearMipmapLinearFilter, LinearMipmapLinearFilter,
LinearMipmapNearestFilter, LinearMipmapNearestFilter,
MathUtils, MathUtils,
Matrix4, Matrix4,
MirroredRepeatWrapping, MirroredRepeatWrapping,
NearestFilter, NearestFilter,
NearestMipmapLinearFilter, NearestMipmapLinearFilter,
NearestMipmapNearestFilter, NearestMipmapNearestFilter,
PropertyBinding, NoColorSpace,
RGBAFormat, PropertyBinding,
RepeatWrapping, Quaternion,
Scene, RepeatWrapping,
Source, REVISION,
SRGBColorSpace, RGBAFormat,
CompressedTexture, Scene,
Vector3, Source,
Quaternion, SRGBColorSpace,
REVISION Vector3
} from 'three'; } from 'three';
import { decompress } from './../utils/TextureUtils.js'; import {decompress} from './../utils/TextureUtils.js';
/** /**

@ -1,46 +1,46 @@
import { import {
FloatType, DataTexture,
HalfFloatType, FloatType,
UnsignedByteType, HalfFloatType,
RGBAFormat, LinearSRGBColorSpace,
RGFormat, NoColorSpace,
RGIntegerFormat, RedFormat,
RedFormat, RedIntegerFormat,
RedIntegerFormat, REVISION,
NoColorSpace, RGBAFormat,
LinearSRGBColorSpace, RGFormat,
SRGBColorSpace, RGIntegerFormat,
DataTexture, SRGBColorSpace,
REVISION, UnsignedByteType,
} from 'three'; } from 'three';
import { import {
write, KHR_DF_CHANNEL_RGBSDA_ALPHA,
KTX2Container, KHR_DF_CHANNEL_RGBSDA_BLUE,
KHR_DF_CHANNEL_RGBSDA_ALPHA, KHR_DF_CHANNEL_RGBSDA_GREEN,
KHR_DF_CHANNEL_RGBSDA_BLUE, KHR_DF_CHANNEL_RGBSDA_RED,
KHR_DF_CHANNEL_RGBSDA_GREEN, KHR_DF_MODEL_RGBSDA,
KHR_DF_CHANNEL_RGBSDA_RED, KHR_DF_PRIMARIES_BT709,
KHR_DF_MODEL_RGBSDA, KHR_DF_PRIMARIES_UNSPECIFIED,
KHR_DF_PRIMARIES_BT709, KHR_DF_SAMPLE_DATATYPE_FLOAT,
KHR_DF_PRIMARIES_UNSPECIFIED, KHR_DF_SAMPLE_DATATYPE_LINEAR,
KHR_DF_SAMPLE_DATATYPE_FLOAT, KHR_DF_SAMPLE_DATATYPE_SIGNED,
KHR_DF_SAMPLE_DATATYPE_LINEAR, KHR_DF_TRANSFER_LINEAR,
KHR_DF_SAMPLE_DATATYPE_SIGNED, KHR_DF_TRANSFER_SRGB,
KHR_DF_TRANSFER_LINEAR, KTX2Container,
KHR_DF_TRANSFER_SRGB, VK_FORMAT_R16_SFLOAT,
VK_FORMAT_R16_SFLOAT, VK_FORMAT_R16G16_SFLOAT,
VK_FORMAT_R16G16_SFLOAT, VK_FORMAT_R16G16B16A16_SFLOAT,
VK_FORMAT_R16G16B16A16_SFLOAT, VK_FORMAT_R32_SFLOAT,
VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT,
VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32A32_SFLOAT,
VK_FORMAT_R32G32B32A32_SFLOAT, VK_FORMAT_R8_SRGB,
VK_FORMAT_R8_SRGB, VK_FORMAT_R8_UNORM,
VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_SRGB,
VK_FORMAT_R8G8_SRGB, VK_FORMAT_R8G8_UNORM,
VK_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8B8A8_SRGB,
VK_FORMAT_R8G8B8A8_SRGB, VK_FORMAT_R8G8B8A8_UNORM,
VK_FORMAT_R8G8B8A8_UNORM, write,
} from '../libs/ktx-parse.module.js'; } from '../libs/ktx-parse.module.js';
const VK_FORMAT_MAP = { const VK_FORMAT_MAP = {

@ -1,9 +1,5 @@
import { import {Matrix4, Quaternion, Vector3} from 'three';
Matrix4, import {MMDParser} from '../libs/mmdparser.module.js';
Quaternion,
Vector3
} from 'three';
import { MMDParser } from '../libs/mmdparser.module.js';
/** /**
* Dependencies * Dependencies

@ -1,9 +1,4 @@
import { import {Color, Matrix3, Vector2, Vector3} from 'three';
Color,
Matrix3,
Vector2,
Vector3
} from 'three';
class OBJExporter { class OBJExporter {

@ -1,8 +1,4 @@
import { import {Color, Matrix3, Vector3} from 'three';
Matrix3,
Vector3,
Color
} from 'three';
/** /**
* https://github.com/gkjohnson/ply-exporter-js * https://github.com/gkjohnson/ply-exporter-js

@ -1,4 +1,4 @@
import { Vector3 } from 'three'; import {Vector3} from 'three';
/** /**
* Usage: * Usage:

@ -1,14 +1,8 @@
import { import {DoubleSide, NoColorSpace,} from 'three';
NoColorSpace,
DoubleSide,
} from 'three';
import { import {strToU8, zipSync,} from '../libs/fflate.module.js';
strToU8,
zipSync,
} from '../libs/fflate.module.js';
import { decompress } from './../utils/TextureUtils.js'; import {decompress} from './../utils/TextureUtils.js';
class USDZExporter { class USDZExporter {

@ -1,7 +1,4 @@
import { import {BufferGeometry, Float32BufferAttribute} from 'three';
BufferGeometry,
Float32BufferAttribute
} from 'three';
class BoxLineGeometry extends BufferGeometry { class BoxLineGeometry extends BufferGeometry {

@ -1,8 +1,5 @@
import { import {BufferGeometry, Float32BufferAttribute} from 'three';
BufferGeometry, import {ConvexHull} from '../math/ConvexHull.js';
Float32BufferAttribute
} from 'three';
import { ConvexHull } from '../math/ConvexHull.js';
class ConvexGeometry extends BufferGeometry { class ConvexGeometry extends BufferGeometry {

@ -1,9 +1,4 @@
import { import {BufferGeometry, Float32BufferAttribute, Matrix4, Vector3} from 'three';
BufferGeometry,
Float32BufferAttribute,
Matrix4,
Vector3
} from 'three';
/** /**
* You can use this geometry to create a decal mesh, that serves different kinds of purposes. * You can use this geometry to create a decal mesh, that serves different kinds of purposes.

@ -1,11 +1,4 @@
import { import {Box3, Float32BufferAttribute, InstancedBufferAttribute, InstancedBufferGeometry, Sphere, Vector3} from 'three';
Box3,
Float32BufferAttribute,
InstancedBufferGeometry,
InstancedBufferAttribute,
Sphere,
Vector3
} from 'three';
const _vector = new Vector3(); const _vector = new Vector3();

@ -1,9 +1,6 @@
import { import {Curve, Vector3} from 'three';
Curve,
Vector3
} from 'three';
import { ParametricGeometry } from './ParametricGeometry.js'; import {ParametricGeometry} from './ParametricGeometry.js';
/** /**
* Experimenting of primitive geometry creation using Surface Parametric equations * Experimenting of primitive geometry creation using Surface Parametric equations

@ -3,11 +3,7 @@
* based on the brilliant article by @prideout https://prideout.net/blog/old/blog/index.html@p=44.html * based on the brilliant article by @prideout https://prideout.net/blog/old/blog/index.html@p=44.html
*/ */
import { import {BufferGeometry, Float32BufferAttribute, Vector3} from 'three';
BufferGeometry,
Float32BufferAttribute,
Vector3
} from 'three';
class ParametricGeometry extends BufferGeometry { class ParametricGeometry extends BufferGeometry {

@ -1,7 +1,4 @@
import { import {BoxGeometry, Vector3} from 'three';
BoxGeometry,
Vector3
} from 'three';
const _tempNormal = new Vector3(); const _tempNormal = new Vector3();

@ -6,19 +6,19 @@
*/ */
import { import {
BufferAttribute, BufferAttribute,
BufferGeometry, BufferGeometry,
FloatType, FloatType,
Mesh, Mesh,
OrthographicCamera, OrthographicCamera,
PlaneGeometry, PlaneGeometry,
Scene, Scene,
ShaderMaterial, ShaderMaterial,
Vector2, Vector2,
WebGLRenderTarget WebGLRenderTarget
} from 'three'; } from 'three';
import { surfaceNet } from './../libs/surfaceNet.js'; import {surfaceNet} from './../libs/surfaceNet.js';
class SDFGeometryGenerator { class SDFGeometryGenerator {

@ -1,10 +1,4 @@
import { import {BufferAttribute, BufferGeometry, Matrix4, Vector3, Vector4} from 'three';
BufferAttribute,
BufferGeometry,
Matrix4,
Vector3,
Vector4
} from 'three';
/** /**
* Tessellates the famous Utah teapot database by Martin Newell into triangles. * Tessellates the famous Utah teapot database by Martin Newell into triangles.

@ -15,9 +15,7 @@
* } * }
*/ */
import { import {ExtrudeGeometry} from 'three';
ExtrudeGeometry
} from 'three';
class TextGeometry extends ExtrudeGeometry { class TextGeometry extends ExtrudeGeometry {

@ -1,8 +1,4 @@
import { import {Mesh, ShaderMaterial, SphereGeometry} from 'three';
Mesh,
ShaderMaterial,
SphereGeometry
} from 'three';
class LightProbeHelper extends Mesh { class LightProbeHelper extends Mesh {

@ -1,9 +1,4 @@
import { import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments} from 'three';
LineSegments,
BufferGeometry,
Float32BufferAttribute,
LineBasicMaterial
} from 'three';
class OctreeHelper extends LineSegments { class OctreeHelper extends LineSegments {

@ -1,10 +1,4 @@
import { import {BufferAttribute, BufferGeometry, Line, LineBasicMaterial, MathUtils} from 'three';
BufferGeometry,
BufferAttribute,
LineBasicMaterial,
Line,
MathUtils
} from 'three';
class PositionalAudioHelper extends Line { class PositionalAudioHelper extends Line {

@ -1,11 +1,11 @@
import { import {
BackSide, BackSide,
BufferGeometry, BufferGeometry,
Float32BufferAttribute, Float32BufferAttribute,
Line, Line,
LineBasicMaterial, LineBasicMaterial,
Mesh, Mesh,
MeshBasicMaterial MeshBasicMaterial
} from 'three'; } from 'three';
/** /**

@ -1,13 +1,5 @@
import { import {BoxGeometry, BufferAttribute, DoubleSide, Mesh, PlaneGeometry, ShaderMaterial, Vector3,} from 'three';
BoxGeometry, import {mergeGeometries} from '../utils/BufferGeometryUtils.js';
BufferAttribute,
DoubleSide,
Mesh,
PlaneGeometry,
ShaderMaterial,
Vector3,
} from 'three';
import { mergeGeometries } from '../utils/BufferGeometryUtils.js';
class TextureHelper extends Mesh { class TextureHelper extends Mesh {

@ -1,11 +1,4 @@
import { import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments, Matrix3, Vector3} from 'three';
BufferGeometry,
Float32BufferAttribute,
LineSegments,
LineBasicMaterial,
Matrix3,
Vector3
} from 'three';
const _v1 = new Vector3(); const _v1 = new Vector3();
const _v2 = new Vector3(); const _v2 = new Vector3();

@ -1,10 +1,4 @@
import { import {BufferGeometry, Float32BufferAttribute, LineBasicMaterial, LineSegments, Vector3} from 'three';
BufferGeometry,
Float32BufferAttribute,
LineSegments,
LineBasicMaterial,
Vector3
} from 'three';
const _v1 = new Vector3(); const _v1 = new Vector3();
const _v2 = new Vector3(); const _v2 = new Vector3();

@ -1,19 +1,19 @@
import { import {
BoxGeometry, BoxGeometry,
CanvasTexture, CanvasTexture,
Color, Color,
Euler, Euler,
Mesh, Mesh,
MeshBasicMaterial, MeshBasicMaterial,
Object3D, Object3D,
OrthographicCamera, OrthographicCamera,
Quaternion, Quaternion,
Raycaster, Raycaster,
Sprite, Sprite,
SpriteMaterial, SpriteMaterial,
Vector2, Vector2,
Vector3, Vector3,
Vector4 Vector4
} from 'three'; } from 'three';
class ViewHelper extends Object3D { class ViewHelper extends Object3D {

@ -1,12 +1,4 @@
import { import {CanvasTexture, Color, LinearFilter, Mesh, MeshBasicMaterial, PlaneGeometry, SRGBColorSpace} from 'three';
CanvasTexture,
LinearFilter,
Mesh,
MeshBasicMaterial,
PlaneGeometry,
SRGBColorSpace,
Color
} from 'three';
class HTMLMesh extends Mesh { class HTMLMesh extends Mesh {

@ -1,8 +1,4 @@
import { import {Group, Raycaster, Vector2} from 'three';
Group,
Raycaster,
Vector2
} from 'three';
const _pointer = new Vector2(); const _pointer = new Vector2();
const _event = { type: '', data: _pointer }; const _event = { type: '', data: _pointer };

@ -1,9 +1,4 @@
import { import {Frustum, Matrix4, Quaternion, Vector3,} from 'three';
Frustum,
Vector3,
Matrix4,
Quaternion,
} from 'three';
/** /**
* This is a class to check whether objects are in a selection area in 3D space * This is a class to check whether objects are in a selection area in 3D space

@ -1,4 +1,4 @@
import { Vector2 } from 'three'; import {Vector2} from 'three';
class SelectionHelper { class SelectionHelper {

@ -1,4 +1,4 @@
import { SpotLight } from 'three'; import {SpotLight} from 'three';
class IESSpotLight extends SpotLight { class IESSpotLight extends SpotLight {

@ -1,13 +1,13 @@
import { import {
Color, Color,
LightProbe, DataUtils,
LinearSRGBColorSpace, HalfFloatType,
SphericalHarmonics3, LightProbe,
Vector3, LinearSRGBColorSpace,
SRGBColorSpace, NoColorSpace,
NoColorSpace, SphericalHarmonics3,
HalfFloatType, SRGBColorSpace,
DataUtils Vector3
} from 'three'; } from 'three';
class LightProbeGenerator { class LightProbeGenerator {

@ -1,14 +1,14 @@
import { import {
ClampToEdgeWrapping, ClampToEdgeWrapping,
DataTexture, DataTexture,
DataUtils, DataUtils,
FloatType, FloatType,
HalfFloatType, HalfFloatType,
LinearFilter, LinearFilter,
NearestFilter, NearestFilter,
RGBAFormat, RGBAFormat,
UVMapping, UniformsLib,
UniformsLib UVMapping
} from 'three'; } from 'three';
/** /**

@ -1,6 +1,6 @@
import { LineSegments2 } from '../lines/LineSegments2.js'; import {LineSegments2} from '../lines/LineSegments2.js';
import { LineGeometry } from '../lines/LineGeometry.js'; import {LineGeometry} from '../lines/LineGeometry.js';
import { LineMaterial } from '../lines/LineMaterial.js'; import {LineMaterial} from '../lines/LineMaterial.js';
class Line2 extends LineSegments2 { class Line2 extends LineSegments2 {

@ -1,4 +1,4 @@
import { LineSegmentsGeometry } from '../lines/LineSegmentsGeometry.js'; import {LineSegmentsGeometry} from '../lines/LineSegmentsGeometry.js';
class LineGeometry extends LineSegmentsGeometry { class LineGeometry extends LineSegmentsGeometry {

@ -11,13 +11,7 @@
* } * }
*/ */
import { import {ShaderLib, ShaderMaterial, UniformsLib, UniformsUtils, Vector2} from 'three';
ShaderLib,
ShaderMaterial,
UniformsLib,
UniformsUtils,
Vector2
} from 'three';
UniformsLib.line = { UniformsLib.line = {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save