Skip to content

Commit 1b5f175

Browse files
kirahankirahan
committed
renderimgcover 初步完成
1 parent ce0d73b commit 1b5f175

38 files changed

+837
-1865
lines changed

‎dist/css/chunk-vendors.51ed1318.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-ts-algdb-player/favicon.ico><title>vue-ts-algdb-explorer</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/vue-ts-algdb-player/css/app.fa0392db.css rel=preload as=style><link href=/vue-ts-algdb-player/css/chunk-vendors.51ed1318.css rel=preload as=style><link href=/vue-ts-algdb-player/js/app.efa43479.js rel=preload as=script><link href=/vue-ts-algdb-player/js/chunk-vendors.b0a40872.js rel=preload as=script><link href=/vue-ts-algdb-player/css/chunk-vendors.51ed1318.css rel=stylesheet><link href=/vue-ts-algdb-player/css/app.fa0392db.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ts-algdb-explorer doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-ts-algdb-player/js/chunk-vendors.b0a40872.js></script><script src=/vue-ts-algdb-player/js/app.efa43479.js></script></body></html>
1+
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/vue-ts-algdb-player/favicon.ico><title>vue-ts-algdb-explorer</title><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link rel=stylesheet href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css><link href=/vue-ts-algdb-player/css/app.b1b363d3.css rel=preload as=style><link href=/vue-ts-algdb-player/css/chunk-vendors.91baed58.css rel=preload as=style><link href=/vue-ts-algdb-player/js/app.b8f35a88.js rel=preload as=script><link href=/vue-ts-algdb-player/js/chunk-vendors.e611a02e.js rel=preload as=script><link href=/vue-ts-algdb-player/css/chunk-vendors.91baed58.css rel=stylesheet><link href=/vue-ts-algdb-player/css/app.b1b363d3.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-ts-algdb-explorer doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vue-ts-algdb-player/js/chunk-vendors.e611a02e.js></script><script src=/vue-ts-algdb-player/js/app.b8f35a88.js></script></body></html>

‎dist/js/chunk-vendors.b0a40872.js‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎dist/js/chunk-vendors.b0a40872.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/showCase.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ import {
162162
Mutation,
163163
namespace
164164
} from 'vuex-class'
165-
import {Component, Prop} from 'vue-property-decorator'
165+
import {Component, Prop, Ref} from 'vue-property-decorator'
166166
import VisualCube from '../plugins/visualcube/VisualCube.vue'
167167
import Viewport from '../plugins/visualcube/Viewport/index.vue';
168168
/* eslint-disable @typescript-eslint/no-inferrable-types */
@@ -185,7 +185,7 @@ export default class Puzzles extends Vue{
185185
@State Navigation
186186
@Action setNavigation
187187
188-
VisualCube: VisualCube
188+
@Ref('VisualCube') VisualCube: VisualCube
189189
190190
VisualCubeSize: number[] = [200,200]
191191
@@ -217,7 +217,6 @@ export default class Puzzles extends Vue{
217217
this.Cases = res.data.data[0]
218218
this.ScreenCardTitle = this.Cases['caseAlgs'][0]['moves']
219219
220-
this.VisualCube = this.$refs.VisualCube;
221220
this.calVisualCubeSize()
222221
console.log(this.$refs)
223222
// 消除子集

‎src/components/showCaseGroup.vue‎

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
>
4242
<v-card
4343
class="mx-auto"
44-
max-width="200"
44+
max-width="250"
4545
:elevation="hover ? 18 : 5"
4646
d-inline
4747
@click="gotopage(caseGroup.shortName)"
@@ -53,7 +53,7 @@
5353
>
5454
</v-img> -->
5555

56-
<VisualCube :config="vcconfig[index]" :cubesize="cubesize"></VisualCube>
56+
<VisualCube :cubeconfig="cubeconfig[index]" :cubesize="cubesize"></VisualCube>
5757

5858
<v-card-title
5959
class="justify-center align-center font-weight-black"
@@ -80,9 +80,14 @@ import {
8080
} from 'vuex-class'
8181
import {Component, Prop} from 'vue-property-decorator'
8282
import showSetOrSubSet from './showSetOrSubSet.vue'
83-
import VisualCube from '../plugins/cubestack/vue/Algplayer/index.vue'
83+
// 直接渲染的版本
84+
// import VisualCube from '../plugins/cubestack/vue/Algplayer/index.vue'
8485
85-
import {VCCongfig} from '../plugins/cubestack/cuber/preferance';
86+
87+
import VisualCube from '../plugins/cubestack/vue/CubeImgCover/index.vue'
88+
89+
90+
import { CubeCongfig } from '../plugins/cubestack/cuber/interface'
8691
8792
@Component({name:'showCaseGroup',components:{showSetOrSubSet,VisualCube}})
8893
export default class Puzzles extends Vue{
@@ -106,7 +111,7 @@ export default class Puzzles extends Vue{
106111
windowSize: any = { x: 0,y:0}
107112
108113
109-
vcconfig: VCCongfig[] = []
114+
cubeconfig: CubeCongfig[] = []
110115
cubesize: number[]
111116
112117
async fetch(){
@@ -115,28 +120,33 @@ export default class Puzzles extends Vue{
115120
116121
// algdb/caseGroup?case=vls&page=1&size=20
117122
const res = await this.$http.get(`algdb/caseGroup?group=${this.setname}&size=100&page=1`)
118-
console.log(res.data.data.length)
119123
if(res.data.data.length!=0){
120124
this.caseGroups = res.data.data
121125
this.title = res.data.data[0].caseGroupWholeName
122-
123126
for(let casegroup of this.caseGroups){
124-
this.vcconfig.push({
127+
this.cubeconfig.push({
125128
name : casegroup.name,
126-
model: 'playground',
129+
model: 'xxx',
127130
lock: true,
128-
cubeconfig: {
129-
order : casegroup.puzzle == '222'? 2: 3
131+
renderconfig:{
132+
cubename: casegroup.name,
133+
size: this.cubesize,
134+
template: 'playground',
135+
coverImgNotModel: true,
136+
scene:'^',
137+
alg: casegroup.genAlgs,
138+
masktype: casegroup.groupName,
139+
preferance: {
140+
order : casegroup.puzzle == '222'? 2: 3
141+
}
130142
},
131143
playerconfig: {
132144
enable: true,
133145
hide: true,
134146
autoplay: false,
135147
loop: true,
136148
hoverplay: true,
137-
scene: '^',
138-
alg: casegroup.genAlgs,
139-
masktype: casegroup.groupName
149+
speed: 'x1',
140150
}
141151
})
142152
}
@@ -147,7 +157,7 @@ export default class Puzzles extends Vue{
147157
}
148158
}
149159
150-
160+
console.log(this.$cuberender)
151161
152162
}
153163
@@ -160,6 +170,7 @@ export default class Puzzles extends Vue{
160170
161171
created(){
162172
this.fetch()
173+
this.refreshcubesize()
163174
const params = this.$route.path.split('/')
164175
const nav: object[] = [{
165176
text:'Home',
@@ -205,15 +216,15 @@ export default class Puzzles extends Vue{
205216
const width = window.innerWidth
206217
// let size = []
207218
if(width<600){
208-
this.cubesize = [100,100]
219+
this.cubesize = [150,150]
209220
}else if(width<960){
210-
this.cubesize = [75,75]
221+
this.cubesize = [100,100]
211222
}else if(width<1264){
212-
this.cubesize = [125,125]
213-
}else if(width<1904){
214223
this.cubesize = [150,150]
224+
}else if(width<1904){
225+
this.cubesize = [200,200]
215226
}else{
216-
this.cubesize = [175,175]
227+
this.cubesize = [250,250]
217228
}
218229
}
219230

‎src/components/test.vue‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
<template>
2+
<div>
3+
<VisualCube :cubeconfig='VisualcubeConfig[0]'></VisualCube>
4+
<VisualCube :cubeconfig='VisualcubeConfig[1]'></VisualCube>
5+
</div>
6+
</template>
7+
8+
<script lang="ts">
9+
import Vue from 'vue'
10+
import VisualCube from '../plugins/cubestack/vue/CubeImgCover/index.vue'
11+
import Component from 'vue-class-component'
12+
import { Ref } from 'vue-property-decorator'
13+
import { CubeCongfig } from '../plugins/cubestack/cuber/interface'
14+
15+
16+
17+
18+
19+
20+
@Component({
21+
name : 'puzzle',
22+
components:{VisualCube}
23+
})
24+
export default class puzzle extends Vue{
25+
constructor(){
26+
super()
27+
}
28+
29+
VisualcubeConfig: CubeCongfig[] = [
30+
{
31+
name: 'cube1',
32+
model : 'xxx',
33+
lock: true,
34+
renderconfig: {
35+
cubename: 'cube1',
36+
size: [300,300],
37+
template: 'playground',
38+
coverImgNotModel: true,
39+
scene:'^',
40+
alg: 'RUR',
41+
masktype: ''
42+
},
43+
playerconfig : {
44+
enable: true,
45+
hide: true,
46+
autoplay: false,
47+
loop: true,
48+
hoverplay: true,
49+
speed: 'x1',
50+
}
51+
},
52+
{
53+
name: 'cube2',
54+
model : 'xxx',
55+
lock: false,
56+
renderconfig: {
57+
cubename: 'cube2',
58+
size: [300,300],
59+
template: 'playground',
60+
coverImgNotModel: true,
61+
scene:'^',
62+
alg: 'R2U2R2',
63+
masktype: 'f2l'
64+
},
65+
playerconfig : {
66+
enable: true,
67+
hide: true,
68+
autoplay: false,
69+
loop: true,
70+
hoverplay: false,
71+
speed: 'x1',
72+
}
73+
}
74+
]
75+
76+
// @Ref('cube1') cube1!: VisualCube
77+
// @Ref('cube2') cube2!: VisualCube
78+
79+
mounted(){
80+
console.log(this.$cuberender)
81+
}
82+
}
83+
</script>
84+
85+
86+
<style scoped>
87+
88+
</style>

‎src/index.d.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/main.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import store from './store'
55
import vuetify from './plugins/vuetify';
66
import axios from 'axios'
77
// import moduleName from './plugins/visualcube/Player/index';
8+
import CubeRenderer from './plugins/cubestack/cuber/renderer'
89

910
Vue.config.productionTip = false
11+
Vue.prototype.$cuberender = new CubeRenderer()
1012

1113
Vue.prototype.$http = axios.create({
1214
// baseURL : 'http://localhost:3000'

0 commit comments

Comments
 (0)