Z-targeting

ImmediateGLBufferAttribute.js

@@ -0,0 +1,114 @@
+import * as THREE from 'three';
+import {getRenderer} from './renderer.js';
+
+export class ImmediateGLBufferAttribute extends THREE.GLBufferAttribute {
+  constructor(array, itemSize, isIndex = false) {
+    const Type = array.constructor;
+    let glType;
+    switch (Type) {
+      case Float32Array: {
+        glType = WebGLRenderingContext.FLOAT;
+        break;
+      }
+      case Uint16Array: {
+        glType = WebGLRenderingContext.UNSIGNED_SHORT;
+        break;
+      }
+      case Int16Array: {
+        glType = WebGLRenderingContext.SHORT;
+        break;
+      }
+      case Uint32Array: {
+        glType = WebGLRenderingContext.UNSIGNED_INT;
+        break;
+      }
+      case Int32Array: {
+        glType = WebGLRenderingContext.INT;
+        break;
+      }
+      case Uint8Array: {
+        glType = WebGLRenderingContext.UNSIGNED_BYTE;
+        break;
+      }
+      case Int8Array: {
+        glType = WebGLRenderingContext.BYTE;
+        break;
+      }
+      default: {
+        throw new Error(`Unsupported array type: ${Type}`);
+      }
+    }
+    const renderer = getRenderer();
+    const gl = renderer.getContext();
+    const buffer = gl.createBuffer();
+    {
+      const target = ImmediateGLBufferAttribute.getTarget(isIndex);
+      const oldBinding = gl.getParameter(ImmediateGLBufferAttribute.getTargetBinding(isIndex));
+      gl.bindBuffer(target, buffer);
+      gl.bufferData(target, array.byteLength, gl.DYNAMIC_DRAW);
+      gl.bindBuffer(target, oldBinding);
+    }
+    super(buffer, glType, itemSize, Type.BYTES_PER_ELEMENT, array.length / itemSize);
+
+    this.array = array;
+    this.isIndex = isIndex;
+    /* this.updateRange = {
+      offset: 0,
+      count: -1,
+    }; */
+  }
+  static getTarget(isIndex) {
+    return isIndex ? WebGLRenderingContext.ELEMENT_ARRAY_BUFFER : WebGLRenderingContext.ARRAY_BUFFER;
+  }
+  getTarget() {
+    return ImmediateGLBufferAttribute.getTarget(this.isIndex);
+  }
+  static getTargetBinding(isIndex) {
+    return isIndex ? WebGLRenderingContext.ELEMENT_ARRAY_BUFFER_BINDING : WebGLRenderingContext.ARRAY_BUFFER_BINDING;
+  }
+  getTargetBinding() {
+    return ImmediateGLBufferAttribute.getTargetBinding(this.isIndex);
+  }
+  pushed = false;
+  static pushUpdate() {
+    const renderer = getRenderer();
+    const gl = renderer.getContext();
+
+    const arrayBufferBinding = gl.getParameter(WebGLRenderingContext.ARRAY_BUFFER_BINDING);
+    const elementArrayBufferBinding = gl.getParameter(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER_BINDING);
+    this.pushed = true;
+
+    const popUpdate = () => {
+      gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, arrayBufferBinding);
+      gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, elementArrayBufferBinding);
+      this.pushed = false;
+    };
+    return popUpdate;
+  }
+  wrap(fn) {
+    let popUpdate = null;
+    if (!ImmediateGLBufferAttribute.pushed) {
+      popUpdate = ImmediateGLBufferAttribute.pushUpdate();
+    }
+
+    fn();
+
+    popUpdate && popUpdate();
+  }
+  update(offset, count, array = this.array, srcOffset = offset) {
+    this.wrap(() => {
+      const renderer = getRenderer();
+      const gl = renderer.getContext();
+      const target = this.getTarget();
+
+      gl.bindBuffer(target, this.buffer);
+      gl.bufferSubData(
+        target,
+        offset * this.elementSize,
+        array,
+        srcOffset,
+        count
+      );
+    });
+  }
+}

ai/lore/lore-ai.js

@@ -3,13 +3,35 @@ import {
   defaultPlayerBio,
   defaultObjectName,
   defaultObjectDescription,
+
   makeLorePrompt,
   makeLoreStop,
+  postProcessResponse,
+  parseLoreResponses,
+
   makeCommentPrompt,
   makeCommentStop,
   parseCommentResponse,
-  postProcessResponse,
-  parseLoreResponses,
+
+  makeSelectTargetPrompt,
+  makeSelectTargetStop,
+  parseSelectTargetResponse,
+
+  makeSelectCharacterPrompt,
+  makeSelectCharacterStop,
+  parseSelectCharacterResponse,
+
+  makeChatPrompt,
+  makeChatStop,
+  parseChatResponse,
+
+  makeOptionsPrompt,
+  makeOptionsStop,
+  parseOptionsResponse,
+
+  makeCharacterIntroPrompt,
+  makeCharacterIntroStop,
+  parseCharacterIntroResponse,
 } from './lore-model.js'
 
 const numGenerateTries = 5;
@@ -193,11 +215,11 @@ class AIScene {
     });
     const stop = makeLoreStop(this.localCharacter, 0);
     let response = await this.generateFn(prompt, stop);
-    console.log('got lore', {prompt, response});
+    // console.log('got lore', {prompt, response});
     response = postProcessResponse(response, this.characters, dstCharacter);
     return response;
   }
-  async generateComment(name, dstCharacter = null) {
+  async generateLocationComment(name, dstCharacter = null) {
     const prompt = makeCommentPrompt({
       settings: this.settings,
       dstCharacter,
@@ -206,9 +228,76 @@ class AIScene {
     const stop = makeCommentStop();
     let response = await this.generateFn(prompt, stop);
     response = parseCommentResponse(response);
-    console.log('got comment', {prompt, response});
+    // console.log('got comment', {prompt, response});
+    return response;
+  }
+
+  // XXX needs better API
+  async generateSelectTargetComment(name, description) {
+    const prompt = makeSelectTargetPrompt({
+      name,
+      description,
+    });
+    console.log('select target prompt', {prompt});
+    const stop = makeSelectTargetStop();
+    let response = await this.generateFn(prompt, stop);
+    console.log('select target response', {prompt, response});
+    response = parseSelectTargetResponse(response);
+    // console.log('got comment', {prompt, response});
     return response;
   }
+  async generateSelectCharacterComment(name, description) {
+    const prompt = makeSelectCharacterPrompt({
+      name,
+      description,
+    });
+    console.log('select character prompt', {prompt});
+    const stop = makeSelectCharacterStop();
+    let response = await this.generateFn(prompt, stop);
+    console.log('select character response', {prompt, response});
+    const response2 = parseSelectCharacterResponse(response);
+    console.log('select character parsed', {response2});
+    return response2;
+  }
+  async generateChatMessage(messages, nextCharacter) {
+    const prompt = makeChatPrompt({
+      messages,
+      nextCharacter,
+    });
+    console.log('chat prompt', {prompt});
+    const stop = makeChatStop();
+    let response = await this.generateFn(prompt, stop);
+    console.log('chat response', {prompt, response});
+    const response2 = parseChatResponse(response);
+    console.log('chat parsed', {response2});
+    return response2;
+  }
+  async generateDialogueOptions(messages, nextCharacter) {
+    const prompt = makeOptionsPrompt({
+      messages,
+      nextCharacter,
+    });
+    console.log('dialogue options prompt', {prompt});
+    const stop = makeOptionsStop();
+    let response = await this.generateFn(prompt, stop);
+    console.log('dialogue options response', {prompt, response});
+    const response2 = parseOptionsResponse(response);
+    console.log('dialogue options parsed', {response2});
+    return response2;
+  }
+  async generateCharacterIntroPrompt(name, bio) {
+    const prompt = makeCharacterIntroPrompt({
+      name,
+      bio,
+    });
+    console.log('dialogue options prompt', {prompt});
+    const stop = makeCharacterIntroStop();
+    let response = await this.generateFn(prompt, stop);
+    console.log('dialogue options response', {prompt, response});
+    const response2 = parseCharacterIntroResponse(response);
+    console.log('dialogue options parsed', {response2});
+    return response2;
+  }
 }
 
 class LoreAI {
@@ -218,7 +307,9 @@ class LoreAI {
   async generate(prompt, {
     stop,
     max_tokens = 100,
-    // temperature,
+    temperature,
+    frequency_penalty,
+    presence_penalty,
     // top_p,
   } = {}) {
     if (prompt) {    
@@ -228,6 +319,15 @@ class LoreAI {
       if (stop !== undefined) {
         query.stop = stop;
       }
+      if (temperature !== undefined) {
+        query.temperature = temperature;
+      }
+      if (frequency_penalty !== undefined) {
+        query.frequency_penalty = frequency_penalty;
+      }
+      if (presence_penalty !== undefined) {
+        query.presence_penalty = presence_penalty;
+      }
 
       query.temperature = temperature;
       query.top_p = top_p;
@@ -286,7 +386,9 @@ class LoreAI {
       generateFn: (prompt, stop) => {
         return this.generate(prompt, {
           stop,
-          // temperature,
+          temperature: 1,
+          presence_penalty: 2,
+          frequency_penalty: 2,
           // top_p,
         });
       },